]> granicus.if.org Git - transmission/commitdiff
#6042: Remove dead code now that we build for OS X 10.7+ (patch by mattrajca)
authorMike Gelfand <mikedld@mikedld.com>
Wed, 6 Jan 2016 11:05:37 +0000 (11:05 +0000)
committerMike Gelfand <mikedld@mikedld.com>
Wed, 6 Jan 2016 11:05:37 +0000 (11:05 +0000)
In addition to the patch,
  * remove unused global actions menu (popover is used instead)
  * remove *Lion class macros, use NSPopover and NSDataDetector directly

24 files changed:
macosx/Controller.h
macosx/Controller.m
macosx/CreatorWindowController.m
macosx/FileOutlineController.m
macosx/GroupsPrefsController.m
macosx/InfoTrackersViewController.m
macosx/MessageWindowController.m
macosx/NSApplicationAdditions.h
macosx/NSApplicationAdditions.m
macosx/PrefsController.m
macosx/StatsWindowController.m
macosx/StatusBarView.m
macosx/TorrentTableView.h
macosx/TorrentTableView.m
macosx/da.lproj/MainMenu.xib
macosx/de.lproj/MainMenu.xib
macosx/en.lproj/MainMenu.xib
macosx/es.lproj/MainMenu.xib
macosx/fr.lproj/MainMenu.xib
macosx/it.lproj/MainMenu.xib
macosx/nl.lproj/MainMenu.xib
macosx/pt_PT.lproj/MainMenu.xib
macosx/ru.lproj/MainMenu.xib
macosx/tr.lproj/MainMenu.xib

index 802aa814e203ae0fd43ca03477b076f67798554b..18616944b74ac9c25070d6e4e7e1db8616d694b9 100644 (file)
@@ -86,15 +86,6 @@ typedef enum
     
     IBOutlet NSMenu                 * fSortMenu;
     
-    IBOutlet NSMenu                 * fActionMenu;
-    
-    IBOutlet NSMenu                 * fUploadMenu, * fDownloadMenu;
-    IBOutlet NSMenuItem             * fUploadLimitItem, * fUploadNoLimitItem,
-                                    * fDownloadLimitItem, * fDownloadNoLimitItem;
-    
-    IBOutlet NSMenu                 * fRatioStopMenu;
-    IBOutlet NSMenuItem             * fCheckRatioItem, * fNoCheckRatioItem;
-    
     IBOutlet NSMenu                 * fGroupsSetMenu, * fGroupsSetContextMenu;
     
     IBOutlet NSMenu                 * fShareMenu, * fShareContextMenu;
@@ -230,12 +221,6 @@ typedef enum
 - (void) speedLimitChanged: (id) sender;
 - (void) altSpeedToggledCallbackIsLimited: (NSDictionary *) dict;
 
-- (void) setLimitGlobalEnabled: (id) sender;
-- (void) setQuickLimitGlobal: (id) sender;
-
-- (void) setRatioGlobalEnabled: (id) sender;
-- (void) setQuickRatioGlobal: (id) sender;
-
 - (void) changeAutoImport;
 - (void) checkAutoImportDirectory;
 
@@ -250,7 +235,6 @@ typedef enum
 - (void) toggleSmallView: (id) sender;
 - (void) togglePiecesBar: (id) sender;
 - (void) toggleAvailabilityBar: (id) sender;
-- (void) toggleStatusString: (id) sender;
 
 - (void) toggleStatusBar: (id) sender;
 - (void) showStatusBar: (BOOL) show animate: (BOOL) animate;
index 8b39dab4b086a50c533816fe8490a4b28bcef8c5..27963493661fc350de2bb387619801c80bbb6c2e 100644 (file)
@@ -1474,13 +1474,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData
 {
-    NSMutableArray * selectedValues = nil;
-    if (![NSApp isOnLionOrBetter])
-    {
-        selectedValues = [NSMutableArray arrayWithArray: [fTableView selectedValues]];
-        [selectedValues removeObjectsInArray: torrents];
-    }
-    
     //miscellaneous
     for (Torrent * torrent in torrents)
     {
@@ -1523,24 +1516,22 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         if ([indexes count] > 0)
         {
-            if ([NSApp isOnLionOrBetter])
+            if (!beganUpdate)
             {
-                if (!beganUpdate)
-                {
-                    [NSAnimationContext beginGrouping]; //this has to be before we set the completion handler (#4874)
-                    
-                    //we can't closeRemoveTorrent: until it's no longer in the GUI at all
-                    [[NSAnimationContext currentContext] setCompletionHandler: ^{
-                        for (Torrent * torrent in torrents)
-                            [torrent closeRemoveTorrent: deleteData];
-                    }];
-                    
-                    [fTableView beginUpdates];
-                    beganUpdate = YES;
-                }
+                [NSAnimationContext beginGrouping]; //this has to be before we set the completion handler (#4874)
+                
+                //we can't closeRemoveTorrent: until it's no longer in the GUI at all
+                [[NSAnimationContext currentContext] setCompletionHandler: ^{
+                    for (Torrent * torrent in torrents)
+                        [torrent closeRemoveTorrent: deleteData];
+                }];
                 
-                [fTableView removeItemsAtIndexes: indexes inParent: parent withAnimation: NSTableViewAnimationSlideLeft];
+                [fTableView beginUpdates];
+                beganUpdate = YES;
             }
+            
+            [fTableView removeItemsAtIndexes: indexes inParent: parent withAnimation: NSTableViewAnimationSlideLeft];
+
             [displayedTorrents removeObjectsAtIndexes: indexes];
         }
     };
@@ -1570,9 +1561,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             [torrent closeRemoveTorrent: deleteData];
     }
     
-    if (selectedValues)
-        [fTableView selectValues: selectedValues];
-    
     [self fullUpdateUI];
 }
 
@@ -2226,18 +2214,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) sortTorrents: (BOOL) includeQueueOrder
 {
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    NSArray * selectedValues;
-    if (!onLion)
-        selectedValues = [fTableView selectedValues];
-    
     //actually sort
     [self sortTorrentsCallUpdates: YES includeQueueOrder: includeQueueOrder];
-    
-    if (!onLion)
-        [fTableView selectValues: selectedValues];
-    
     [fTableView setNeedsDisplay: YES];
 }
 
@@ -2306,7 +2284,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         descriptors = [NSArray arrayWithObject: orderDescriptor];
     }
     
-    BOOL beganTableUpdate = !callUpdates || ![NSApp isOnLionOrBetter];
+    BOOL beganTableUpdate = !callUpdates;
     
     //actually sort
     if ([fDefaults boolForKey: @"SortByGroup"])
@@ -2319,10 +2297,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     
     if (beganTableUpdate && callUpdates)
     {
-        if ([NSApp isOnLionOrBetter])
-            [fTableView endUpdates];
-        else
-            [fTableView reloadData];
+        [fTableView endUpdates];
     }
 }
 
@@ -2348,13 +2323,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             if (!*beganTableUpdate)
             {
                 *beganTableUpdate = YES;
-                if ([NSApp isOnLionOrBetter])
-                    [fTableView beginUpdates];
+                [fTableView beginUpdates];
             }
             
             [rearrangeArray moveObjectAtIndex: currentIndex toIndex: insertIndex];
-            if ([NSApp isOnLionOrBetter])
-                [fTableView moveItemAtIndex: currentIndex inParent: parent toIndex: insertIndex inParent: parent];
+            [fTableView moveItemAtIndex: currentIndex inParent: parent toIndex: insertIndex inParent: parent];
         }
     }
     
@@ -2363,12 +2336,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) applyFilter
 {
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    NSArray * selectedValuesSL = nil;
-    if (!onLion)
-        selectedValuesSL = [fTableView selectedValues];
-    
     __block int32_t active = 0, downloading = 0, seeding = 0, paused = 0;
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
     BOOL filterActive = NO, filterDownload = NO, filterSeed = NO, filterPause = NO, filterStatus = YES;
@@ -2498,16 +2465,13 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     }
     
     BOOL beganUpdates = NO;
-    
-    if (onLion)
-    {
-        //don't animate torrents when first launching
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            [[NSAnimationContext currentContext] setDuration: 0];
-        });
-        [NSAnimationContext beginGrouping];
-    }
+
+    //don't animate torrents when first launching
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [[NSAnimationContext currentContext] setDuration: 0];
+    });
+    [NSAnimationContext beginGrouping];
     
     //add/remove torrents (and rearrange for groups), one by one
     if (!groupRows && !wasGroupRows)
@@ -2529,15 +2493,13 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         if ([addIndexes count] > 0 || [removePreviousIndexes count] > 0)
         {
             beganUpdates = YES;
-            if (onLion)
-                [fTableView beginUpdates];
+            [fTableView beginUpdates];
             
             //remove torrents we didn't find
             if ([removePreviousIndexes count] > 0)
             {
                 [fDisplayedTorrents removeObjectsAtIndexes: removePreviousIndexes];
-                if (onLion)
-                    [fTableView removeItemsAtIndexes: removePreviousIndexes inParent: nil withAnimation: NSTableViewAnimationSlideDown];
+                [fTableView removeItemsAtIndexes: removePreviousIndexes inParent: nil withAnimation: NSTableViewAnimationSlideDown];
             }
             
             //add new torrents
@@ -2553,13 +2515,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                     [addIndexes removeIndexes: newAddIndexes];
                     
                     [fDisplayedTorrents addObjectsFromArray: [allTorrents objectsAtIndexes: newAddIndexes]];
-                    if (onLion)
-                        [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange([fDisplayedTorrents count] - [newAddIndexes count], [newAddIndexes count])] inParent: nil withAnimation: NSTableViewAnimationSlideLeft];
+                    [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange([fDisplayedTorrents count] - [newAddIndexes count], [newAddIndexes count])] inParent: nil withAnimation: NSTableViewAnimationSlideLeft];
                 }
                 
                 [fDisplayedTorrents addObjectsFromArray: [allTorrents objectsAtIndexes: addIndexes]];
-                if (onLion)
-                    [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange([fDisplayedTorrents count] - [addIndexes count], [addIndexes count])] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
+                [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange([fDisplayedTorrents count] - [addIndexes count], [addIndexes count])] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
             }
         }
     }
@@ -2569,8 +2529,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         #warning don't always do?
         beganUpdates = YES;
-        if (onLion)
-            [fTableView beginUpdates];
+        [fTableView beginUpdates];
         
         NSMutableIndexSet * unusedAllTorrentsIndexes = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [allTorrents count])];
         
@@ -2607,12 +2566,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                             newGroup = [[[TorrentGroup alloc] initWithGroup: groupValue] autorelease];
                             [groupsByIndex setObject: newGroup forKey: [NSNumber numberWithInteger: groupValue]];
                             [fDisplayedTorrents addObject: newGroup];
-                            
-                            if (onLion)
-                            {
-                                [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [fDisplayedTorrents count]-1] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
-                                [fTableView isGroupCollapsed: groupValue] ? [fTableView collapseItem: newGroup] : [fTableView expandItem: newGroup];
-                            }
+
+                            [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [fDisplayedTorrents count]-1] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
+                            [fTableView isGroupCollapsed: groupValue] ? [fTableView collapseItem: newGroup] : [fTableView expandItem: newGroup];
                         }
                         else //if we haven't processed the other group yet, we have to make sure we don't flag it for removal the next time
                         {
@@ -2623,9 +2579,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                         
                         [[group torrents] removeObjectAtIndex: indexInGroup];
                         [[newGroup torrents] addObject: torrent];
-                        
-                        if (onLion)
-                            [fTableView moveItemAtIndex: indexInGroup inParent: group toIndex: [[newGroup torrents] count]-1 inParent: newGroup];
+
+                        [fTableView moveItemAtIndex: indexInGroup inParent: group toIndex: [[newGroup torrents] count]-1 inParent: newGroup];
                         
                         --indexInGroup;
                     }
@@ -2638,8 +2593,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             if ([removeIndexes count] > 0)
             {
                 [[group torrents] removeObjectsAtIndexes: removeIndexes];
-                if (onLion)
-                    [fTableView removeItemsAtIndexes: removeIndexes inParent: group withAnimation: NSTableViewAnimationEffectFade];
+                [fTableView removeItemsAtIndexes: removeIndexes inParent: group withAnimation: NSTableViewAnimationEffectFade];
             }
         }
         
@@ -2653,20 +2607,15 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                 group = [[[TorrentGroup alloc] initWithGroup: groupValue] autorelease];
                 [groupsByIndex setObject: group forKey: [NSNumber numberWithInteger: groupValue]];
                 [fDisplayedTorrents addObject: group];
-                
-                if (onLion)
-                {
-                    [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [fDisplayedTorrents count]-1] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
-                    [fTableView isGroupCollapsed: groupValue] ? [fTableView collapseItem: group] : [fTableView expandItem: group];
-                }
+
+                [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [fDisplayedTorrents count]-1] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
+                [fTableView isGroupCollapsed: groupValue] ? [fTableView collapseItem: group] : [fTableView expandItem: group];
             }
             
             [[group torrents] addObject: torrent];
-            if (onLion)
-            {
-                const BOOL newTorrent = fAddingTransfers && [fAddingTransfers containsObject: torrent];
-                [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [[group torrents] count]-1] inParent: group withAnimation: newTorrent ? NSTableViewAnimationSlideLeft : NSTableViewAnimationSlideDown];
-            }
+
+            const BOOL newTorrent = fAddingTransfers && [fAddingTransfers containsObject: torrent];
+            [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndex: [[group torrents] count]-1] inParent: group withAnimation: newTorrent ? NSTableViewAnimationSlideLeft : NSTableViewAnimationSlideDown];
         }
         
         //remove empty groups
@@ -2677,8 +2626,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         if ([removeGroupIndexes count] > 0)
         {
             [fDisplayedTorrents removeObjectsAtIndexes: removeGroupIndexes];
-            if (onLion)
-                [fTableView removeItemsAtIndexes: removeGroupIndexes inParent: nil withAnimation: NSTableViewAnimationEffectFade];
+            [fTableView removeItemsAtIndexes: removeGroupIndexes inParent: nil withAnimation: NSTableViewAnimationEffectFade];
         }
         
         //now that all groups are there, sort them - don't insert on the fly in case groups were reordered in prefs
@@ -2697,11 +2645,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         NSArray * selectedValues = [fTableView selectedValues];
         
         beganUpdates = YES;
-        if (onLion)
-            [fTableView beginUpdates];
-        
-        if (onLion)
-            [fTableView removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedTorrents count])] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
+        [fTableView beginUpdates];
+
+        [fTableView removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedTorrents count])] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
         
         if (groupRows)
         {
@@ -2728,9 +2674,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         }
         else
             [fDisplayedTorrents setArray: allTorrents];
-        
-        if (onLion)
-            [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedTorrents count])] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
+
+        [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedTorrents count])] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
         
         if (groupRows) 
         { 
@@ -2745,34 +2690,13 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     
     //sort the torrents (won't sort the groups, though)
     [self sortTorrentsCallUpdates: !beganUpdates includeQueueOrder: YES];
+
+    if (beganUpdates)
+        [fTableView endUpdates];
+    [fTableView setNeedsDisplay: YES];
     
-    if (onLion)
-    {
-        if (beganUpdates)
-            [fTableView endUpdates];
-        [fTableView setNeedsDisplay: YES];
-        
-        [NSAnimationContext endGrouping];
-    }
-    else
-    {
-        [fTableView reloadData];
-        
-        if (groupRows)
-        {
-            for (TorrentGroup * group in fDisplayedTorrents)
-            {
-                if ([fTableView isGroupCollapsed: [group groupIndex]])
-                    [fTableView collapseItem: group];
-                else
-                    [fTableView expandItem: group];
-            }
-        }
-    }
-    
-    if (!onLion)
-        [fTableView selectValues: selectedValuesSL];
-    
+    [NSAnimationContext endGrouping];
+
     [self resetInfo]; //if group is already selected, but the torrents in it change
     
     [self setBottomCountText: groupRows || filterStatus || filterGroup || searchStrings];
@@ -2793,31 +2717,19 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (IBAction) showGlobalPopover: (id) sender
 {
-    if ([NSApp isOnLionOrBetter])
-    {
-        if (fGlobalPopoverShown)
-            return;
-        
-        NSPopover * popover = [[NSPopoverLion alloc] init];
-        [popover setBehavior: NSPopoverBehaviorTransient];
-        GlobalOptionsPopoverViewController * viewController = [[GlobalOptionsPopoverViewController alloc] initWithHandle: fLib];
-        [popover setContentViewController: viewController];
-        [popover setDelegate: self];
-        
-        [popover showRelativeToRect: [sender frame] ofView: sender preferredEdge: NSMaxYEdge];
-        
-        [viewController release];
-        [popover release];
-    }
-    else
-    {
-        //place menu below button
-        NSRect rect = [sender frame];
-        NSPoint location = rect.origin;
-        location.y += NSHeight(rect) + 5.0;
-        
-        [fActionMenu popUpMenuPositioningItem: nil atLocation: location inView: sender];
-    }
+    if (fGlobalPopoverShown)
+        return;
+    
+    NSPopover * popover = [[NSPopover alloc] init];
+    [popover setBehavior: NSPopoverBehaviorTransient];
+    GlobalOptionsPopoverViewController * viewController = [[GlobalOptionsPopoverViewController alloc] initWithHandle: fLib];
+    [popover setContentViewController: viewController];
+    [popover setDelegate: self];
+    
+    [popover showRelativeToRect: [sender frame] ofView: sender preferredEdge: NSMaxYEdge];
+    
+    [viewController release];
+    [popover release];
 }
 
 //don't show multiple popovers when clicking the gear button repeatedly
@@ -2849,43 +2761,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             [item release];
         }
     }
-    else if (menu == fUploadMenu || menu == fDownloadMenu)
-    {
-        if ([menu numberOfItems] > 3)
-            return;
-        
-        const NSInteger speedLimitActionValue[] = { 5, 10, 20, 30, 40, 50, 75, 100, 150, 200, 250, 500, 750, 1000, 1500, 2000, -1 };
-        
-        NSMenuItem * item;
-        for (NSInteger 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(setQuickLimitGlobal:)
-                    keyEquivalent: @""];
-            [item setTarget: self];
-            [item setRepresentedObject: [NSNumber numberWithInt: speedLimitActionValue[i]]];
-            [menu addItem: item];
-            [item release];
-        }
-    }
-    else if (menu == fRatioStopMenu)
-    {
-        if ([menu numberOfItems] > 3)
-            return;
-        
-        const float ratioLimitActionValue[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, -1 };
-        
-        NSMenuItem * item;
-        for (NSInteger i = 0; ratioLimitActionValue[i] != -1; i++)
-        {
-            item = [[NSMenuItem alloc] initWithTitle: [NSString localizedStringWithFormat: @"%.2f", ratioLimitActionValue[i]]
-                    action: @selector(setQuickRatioGlobal:) keyEquivalent: @""];
-            [item setTarget: self];
-            [item setRepresentedObject: [NSNumber numberWithFloat: ratioLimitActionValue[i]]];
-            [menu addItem: item];
-            [item release];
-        }
-    }
     else if (menu == fShareMenu || menu == fShareContextMenu) {
         [menu removeAllItems];
         
@@ -2944,39 +2819,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [dict release];
 }
 
-- (void) setLimitGlobalEnabled: (id) sender
-{
-    BOOL upload = [sender menu] == fUploadMenu;
-    [fDefaults setBool: sender == (upload ? fUploadLimitItem : fDownloadLimitItem) forKey: upload ? @"CheckUpload" : @"CheckDownload"];
-    
-    [fPrefsController applySpeedSettings: nil];
-}
-
-- (void) setQuickLimitGlobal: (id) sender
-{
-    BOOL upload = [sender menu] == fUploadMenu;
-    [fDefaults setInteger: [[sender representedObject] intValue] forKey: upload ? @"UploadLimit" : @"DownloadLimit"];
-    [fDefaults setBool: YES forKey: upload ? @"CheckUpload" : @"CheckDownload"];
-    
-    [fPrefsController updateLimitFields];
-    [fPrefsController applySpeedSettings: nil];
-}
-
-- (void) setRatioGlobalEnabled: (id) sender
-{
-    [fDefaults setBool: sender == fCheckRatioItem forKey: @"RatioCheck"];
-    
-    [fPrefsController applyRatioSetting: nil];
-}
-
-- (void) setQuickRatioGlobal: (id) sender
-{
-    [fDefaults setBool: YES forKey: @"RatioCheck"];
-    [fDefaults setFloat: [[sender representedObject] floatValue] forKey: @"RatioLimit"];
-    
-    [fPrefsController updateRatioStopFieldOld];
-}
-
 - (void) sound: (NSSound *) sound didFinishPlaying: (BOOL) finishedPlaying
 {
     fSoundPlaying = NO;
@@ -3232,11 +3074,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     NSPasteboard * pasteboard = [info draggingPasteboard];
     if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
     {
-        //remember selected rows
-        NSArray * selectedValues = nil;
-        if (![NSApp isOnLionOrBetter])
-            selectedValues = [fTableView selectedValues];
-    
         NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [pasteboard dataForType: TORRENT_TABLE_VIEW_DATA_TYPE]];
         
         //get the torrents to move
@@ -3284,9 +3121,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             }
             
             //do the drag animation here so that the dragged torrents are the ones that are animated as moving, and not the torrents around them
-            const BOOL onLion = [NSApp isOnLionOrBetter];
-            if (onLion)
-                [fTableView beginUpdates];
+            [fTableView beginUpdates];
             
             NSUInteger insertDisplayIndex = topTorrent ? [groupTorrents indexOfObject: topTorrent] + 1 : 0;
             
@@ -3310,20 +3145,16 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                     [newTorrents insertObject: torrent atIndex: insertDisplayIndex];
                     [oldTorrents removeObjectAtIndex: oldIndex];
                 }
-                
-                if (onLion)
-                    [fTableView moveItemAtIndex: oldIndex inParent: oldParent toIndex: insertDisplayIndex inParent: item];
+
+                [fTableView moveItemAtIndex: oldIndex inParent: oldParent toIndex: insertDisplayIndex inParent: item];
                 
                 ++insertDisplayIndex;
             }
-            
-            if (onLion)
-                [fTableView endUpdates];
+
+            [fTableView endUpdates];
         }
         
         [self applyFilter];
-        if (selectedValues)
-            [fTableView selectValues: selectedValues];
     }
     
     return YES;
@@ -3453,12 +3284,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [fTableView setUsesAlternatingRowBackgroundColors: !makeSmall];
     
     [fTableView setRowHeight: makeSmall ? ROW_HEIGHT_SMALL : ROW_HEIGHT_REGULAR];
-    
-    if ([NSApp isOnLionOrBetter])
-        [fTableView beginUpdates];
+
+    [fTableView beginUpdates];
     [fTableView noteHeightOfRowsWithIndexesChanged: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTableView numberOfRows])]];
-    if ([NSApp isOnLionOrBetter])
-        [fTableView endUpdates];
+    [fTableView endUpdates];
     
     //resize for larger min height if not set to auto size
     if (![fDefaults boolForKey: @"AutoSize"])
@@ -3496,17 +3325,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [fTableView display];
 }
 
-#warning elliminate when 10.7-only
-- (void) toggleStatusString: (id) sender
-{
-    if ([fDefaults boolForKey: @"SmallView"])
-        [fDefaults setBool: ![fDefaults boolForKey: @"DisplaySmallStatusRegular"] forKey: @"DisplaySmallStatusRegular"];
-    else
-        [fDefaults setBool: ![fDefaults boolForKey: @"DisplayStatusProgressSelected"] forKey: @"DisplayStatusProgressSelected"];
-    
-    [fTableView setNeedsDisplay: YES];
-}
-
 - (NSRect) windowFrameByAddingHeight: (CGFloat) height checkLimits: (BOOL) check
 {
     NSScrollView * scrollView = [fTableView enclosingScrollView];
@@ -4301,53 +4119,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         return [fWindow isVisible];
     }
     
-    #warning remove when menu is removed (10.7-only)
-    if (action == @selector(toggleStatusString:))
-    {
-        if ([fDefaults boolForKey: @"SmallView"])
-        {
-            [menuItem setTitle: NSLocalizedString(@"Remaining Time", "Action menu -> status string toggle")];
-            [menuItem setState: ![fDefaults boolForKey: @"DisplaySmallStatusRegular"] ? NSOnState : NSOffState];
-        }
-        else
-        {
-            [menuItem setTitle: NSLocalizedString(@"Status of Selected Files", "Action menu -> status string toggle")];
-            [menuItem setState: [fDefaults boolForKey: @"DisplayStatusProgressSelected"] ? NSOnState : NSOffState];
-        }
-        
-        return [fWindow isVisible];
-    }
-    
     if (action == @selector(toggleAvailabilityBar:))
     {
         [menuItem setState: [fDefaults boolForKey: @"DisplayProgressBarAvailable"] ? NSOnState : NSOffState];
         return [fWindow isVisible];
     }
     
-    if (action == @selector(setLimitGlobalEnabled:))
-    {
-        BOOL upload = [menuItem menu] == fUploadMenu;
-        BOOL limit = menuItem == (upload ? fUploadLimitItem : fDownloadLimitItem);
-        if (limit)
-            [menuItem setTitle: [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
-                                    "Action menu -> upload/download limit"),
-                                    [fDefaults integerForKey: upload ? @"UploadLimit" : @"DownloadLimit"]]];
-        
-        [menuItem setState: [fDefaults boolForKey: upload ? @"CheckUpload" : @"CheckDownload"] ? limit : !limit];
-        return YES;
-    }
-    
-    if (action == @selector(setRatioGlobalEnabled:))
-    {
-        BOOL check = menuItem == fCheckRatioItem;
-        if (check)
-            [menuItem setTitle: [NSString localizedStringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
-                                    "Action menu -> ratio stop"), [fDefaults floatForKey: @"RatioLimit"]]];
-        
-        [menuItem setState: [fDefaults boolForKey: @"RatioCheck"] ? check : !check];
-        return YES;
-    }
-
     //enable show info
     if (action == @selector(showInfo:))
     {
index c702c44614fe43771c93a9c4cd0932c00515aefc..df5552935688983f7ac45f67caf6ebb9273b87a3 100644 (file)
 
 - (void) awakeFromNib
 {
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
+    [[self window] setRestorationClass: [self class]];
     
     NSString * name = [fPath lastPathComponent];
     
     [fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"];
     fOpenWhenCreated = [fOpenCheck state] == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
     [fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"];
-    
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorable: NO];
+
+    [[self window] setRestorable: NO];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
     tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
index b88c6b1ac917b4573132853335b09bf85b0eb48e..bfde7a0903c7b5bdb20c01ef74aacbdb66c60abd 100644 (file)
@@ -111,11 +111,8 @@ typedef enum
     
     if ((!text && !fFilterText) || (text && fFilterText && [text isEqualToString: fFilterText]))
         return;
-    
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    if (onLion)
-        [fOutline beginUpdates];
+
+    [fOutline beginUpdates];
     
     NSUInteger currentIndex = 0, totalCount = 0;
     NSMutableArray * itemsToAdd = [NSMutableArray array];
@@ -179,7 +176,7 @@ typedef enum
                     }
                 }
                 
-                if (move && onLion)
+                if (move)
                     [fOutline moveItemAtIndex: previousIndex inParent: parent toIndex: currentIndex inParent: nil];
                 
                 ++currentIndex;
@@ -194,19 +191,14 @@ typedef enum
     {
         const NSRange removeRange = NSMakeRange(currentIndex, [fFileList count]-currentIndex);
         [fFileList removeObjectsInRange: removeRange];
-        if (onLion)
-            [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
+        [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
     }
     
     //add new items
     [fFileList insertObjects: itemsToAdd atIndexes: itemsToAddIndexes];
-    if (onLion)
-        [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
-    
-    if (onLion)
-        [fOutline endUpdates];
-    else
-        [fOutline reloadData];
+    [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
+
+    [fOutline endUpdates];
     
     [fFilterText release];
     fFilterText = [text retain];
index 553d876d946c9c7ce35ccd2576fa324dbba94c50..a5bc2916a14f7ca87abb66afc8a59da34cd274d1 100644 (file)
     if ([[pasteboard types] containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
     {
         NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [pasteboard dataForType: GROUP_TABLE_VIEW_DATA_TYPE]];
-        NSInteger oldRow = [indexes firstIndex], selectedRow = [fTableView selectedRow];
+        NSInteger oldRow = [indexes firstIndex];
         
         if (oldRow < newRow)
             newRow--;
-        
-        if ([NSApp isOnLionOrBetter])
-            [fTableView beginUpdates];
+
+        [fTableView beginUpdates];
         
         [[GroupsController groups] moveGroupAtRow: oldRow toRow: newRow];
-        
-        if ([NSApp isOnLionOrBetter])
-        {
-            [fTableView moveRowAtIndex: oldRow toIndex: newRow];
-            [fTableView endUpdates];
-        }
-        else
-        {
-            if (selectedRow == oldRow)
-                selectedRow = newRow;
-            else if (selectedRow > oldRow && selectedRow <= newRow)
-                selectedRow--;
-            else if (selectedRow < oldRow && selectedRow >= newRow)
-                selectedRow++;
-            else;
-            
-            [fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: selectedRow] byExtendingSelection: NO];
-            [fTableView reloadData];
-        }
+
+        [fTableView moveRowAtIndex: oldRow toIndex: newRow];
+        [fTableView endUpdates];
     }
     
     return YES;
     switch ([[sender cell] tagForSegment: [sender selectedSegment]])
     {
         case ADD_TAG:
-            if ([NSApp isOnLionOrBetter])
-                [fTableView beginUpdates];
+            [fTableView beginUpdates];
             
             [[GroupsController groups] addNewGroup];
             
             row = [fTableView numberOfRows];
-            
-            if ([NSApp isOnLionOrBetter])
-            {
-                [fTableView insertRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
-                [fTableView endUpdates];
-            }
-            else
-                [fTableView reloadData];
+
+            [fTableView insertRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
+            [fTableView endUpdates];
             
             [fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
             [fTableView scrollRowToVisible: row];
         case REMOVE_TAG:
             row = [fTableView selectedRow];
             
-            
-            if ([NSApp isOnLionOrBetter])
-                [fTableView beginUpdates];
+
+            [fTableView beginUpdates];
             
             [[GroupsController groups] removeGroupWithRowIndex: row];            
-            
-            if ([NSApp isOnLionOrBetter])
-            {
-                [fTableView removeRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
-                [fTableView endUpdates];
-            }
-            else
-                [fTableView reloadData];
+
+            [fTableView removeRowsAtIndexes: [NSIndexSet indexSetWithIndex: row] withAnimation: NSTableViewAnimationSlideUp];
+            [fTableView endUpdates];
             
             if ([fTableView numberOfRows] > 0)
             {
index d1aa9a6016db8a931db0a5ac21da5211d36493cd..719164c740d3da041207c40fbcefe138b0df3bbb 100644 (file)
         
         [fTrackerTable setTrackers: fTrackers];
         
-        if ([NSApp isOnLionOrBetter] && (oldTrackers && [fTrackers isEqualToArray: oldTrackers]))
+        if (oldTrackers && [fTrackers isEqualToArray: oldTrackers])
             [fTrackerTable setNeedsDisplay: YES];
         else
             [fTrackerTable reloadData];
             return;
     }
     
-    
-    if ([NSApp isOnLionOrBetter])
-        [fTrackerTable beginUpdates];
+
+    [fTrackerTable beginUpdates];
     
     for (Torrent * torrent in removeIdentifiers)
         [torrent removeTrackers: [removeIdentifiers objectForKey: torrent]];
     fTrackers = [[NSMutableArray alloc] init];
     for (Torrent * torrent in fTorrents)
         [fTrackers addObjectsFromArray: [torrent allTrackerStats]];
+
+    [fTrackerTable removeRowsAtIndexes: removeIndexes withAnimation: NSTableViewAnimationSlideLeft];
     
-    if ([NSApp isOnLionOrBetter])
-    {
-        [fTrackerTable removeRowsAtIndexes: removeIndexes withAnimation: NSTableViewAnimationSlideLeft];
-        
-        [fTrackerTable setTrackers: fTrackers];
-        
-        [fTrackerTable endUpdates];
-    }
-    else
-    {
-        [fTrackerTable setTrackers: fTrackers];
-        
-        [fTrackerTable reloadData];
-        [fTrackerTable deselectAll: self];
-    }
+    [fTrackerTable setTrackers: fTrackers];
+    
+    [fTrackerTable endUpdates];
     
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateUI" object: nil]; //incase sort by tracker
 }
index ad31f8740bd87dc3c959d9fff2216b9c1f016ded..5cc3e98a605015103b1747c9aeb54a5df3727977 100644 (file)
@@ -57,9 +57,7 @@
     NSWindow * window = [self window];
     [window setFrameAutosaveName: @"MessageWindowFrame"];
     [window setFrameUsingName: @"MessageWindowFrame"];
-    
-    if ([NSApp isOnLionOrBetter])
-        [window setRestorationClass: [self class]];
+    [window setRestorationClass: [self class]];
     
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeColumn)
         name: NSTableViewColumnDidResizeNotification object: fMessageTable];
     [fLock lock];
     
     [fMessages removeAllObjects];
-    
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    if (onLion)
-        [fMessageTable beginUpdates];
-    
-    if (onLion)
-        [fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedMessages count])] withAnimation: NSTableViewAnimationSlideLeft];
+
+    [fMessageTable beginUpdates];
+    [fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedMessages count])] withAnimation: NSTableViewAnimationSlideLeft];
+
     [fDisplayedMessages removeAllObjects];
-    
-    if (onLion)
-        [fMessageTable endUpdates];
-    else
-        [fMessageTable reloadData];
+
+    [fMessageTable endUpdates];
     
     [fLock unlock];
 }
     }];
     
     NSArray * tempMessages = [[fMessages objectsAtIndexes: indexes] sortedArrayUsingDescriptors: [fMessageTable sortDescriptors]];
-    
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    if (onLion)
-        [fMessageTable beginUpdates];
+
+    [fMessageTable beginUpdates];
     
     //figure out which rows were added/moved
     NSUInteger currentIndex = 0, totalCount = 0;
             if (previousIndex != currentIndex)
             {
                 [fDisplayedMessages moveObjectAtIndex: previousIndex toIndex: currentIndex];
-                if (onLion)
-                    [fMessageTable moveRowAtIndex: previousIndex toIndex: currentIndex];
+                [fMessageTable moveRowAtIndex: previousIndex toIndex: currentIndex];
             }
             ++currentIndex;
         }
     {
         const NSRange removeRange = NSMakeRange(currentIndex, [fDisplayedMessages count]-currentIndex);
         [fDisplayedMessages removeObjectsInRange: removeRange];
-        if (onLion)
-            [fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] withAnimation: NSTableViewAnimationSlideDown];
+        [fMessageTable removeRowsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] withAnimation: NSTableViewAnimationSlideDown];
     }
     
     //add new items
     [fDisplayedMessages insertObjects: itemsToAdd atIndexes: itemsToAddIndexes];
-    if (onLion)
-        [fMessageTable insertRowsAtIndexes: itemsToAddIndexes withAnimation: NSTableViewAnimationSlideUp];
-    
-    if (onLion)
-        [fMessageTable endUpdates];
-    else
-    {
-        [fMessageTable reloadData];
-        
-        if ([fDisplayedMessages count] > 0)
-            [fMessageTable deselectAll: self];
-    }
+    [fMessageTable insertRowsAtIndexes: itemsToAddIndexes withAnimation: NSTableViewAnimationSlideUp];
+
+    [fMessageTable endUpdates];
     
     NSAssert2([fDisplayedMessages isEqualToArray: tempMessages], @"Inconsistency between message arrays! %@ %@", fDisplayedMessages, tempMessages);
 }
index 7ff60947a716a8032c55ba28849fe67b44b242e0..dd4474b0008fad50d185c00396944aeb95a39372 100644 (file)
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-#define NSPopoverLion NSClassFromString(@"NSPopover")
-#define NSDataDetectorLion NSClassFromString(@"NSDataDetector")
 #define NSByteCountFormatterMtLion NSClassFromString(@"NSByteCountFormatter")
 #define NSUserNotificationMtLion NSClassFromString(@"NSUserNotification")
 #define NSUserNotificationCenterMtLion NSClassFromString(@"NSUserNotificationCenter")
 
 @interface NSApplication (NSApplicationAdditions)
 
-- (BOOL) isOnLionOrBetter;
 - (BOOL) isOnMountainLionOrBetter;
 - (BOOL) isOnYosemiteOrBetter;
 
index 2c9b25b5011b0b31e1fa5f2202223d21db3c0250..2313b8cc9446c34a27138994d9589d2be7599435 100644 (file)
 
 @implementation NSApplication (NSApplicationAdditions)
 
-- (BOOL) isOnLionOrBetter
-{
-       return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6;
-}
-
 - (BOOL) isOnMountainLionOrBetter
 {
     return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_7;
index b711e7069121cb6955e61dce157bbfb2d32e4582..35dccfa74c8319dafff163623901c280e3a991b3 100644 (file)
 - (void) awakeFromNib
 {
     fHasLoaded = YES;
-    
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
+
+    [[self window] setRestorationClass: [self class]];
     
     NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
     [toolbar setDelegate: self];
index 73b05ccf48f59e73e5550ec5ff66635b343c8d94..bd819e0e74d039019293ea652b225ece2dc04326 100644 (file)
@@ -66,9 +66,8 @@ tr_session * fLib = NULL;
     fTimer = [[NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateStats) userInfo: nil repeats: YES] retain];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
-    
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
+
+    [[self window] setRestorationClass: [self class]];
     
     [[self window] setTitle: NSLocalizedString(@"Statistics", "Stats window -> title")];
     
index 447f7e28d145f6df64e6f4d0ffc8a0f45c4c3ef2..a926b0f4b5b19616fa945a79cb67dfdd291e37a0 100644 (file)
@@ -42,7 +42,7 @@
         NSColor * darkColor = [NSColor colorWithCalibratedRed: 155.0/255.0 green: 155.0/255.0 blue: 155.0/255.0 alpha: 1.0];
         fGradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor];
         
-        if([NSApp isOnLionOrBetter] && ![NSApp isOnYosemiteOrBetter])
+        if (![NSApp isOnYosemiteOrBetter])
         {
             CIFilter * randomFilter = [CIFilter filterWithName: @"CIRandomGenerator"];
             [randomFilter setDefaults];
         NSRectFillListWithColors(gridRects, colorRects, count);
         
         if (fNoiseImage) {
-            NSAssert([NSApp isOnLionOrBetter], @"we have a noise image, but we're on 10.6"); //https://trac.transmissionbt.com/ticket/5053
             [fNoiseImage drawInRect: rect
                            fromRect: [self convertRectToBacking: rect]
                           operation: NSCompositeSourceOver
index e876699135e16f6510dcf8371602fe987016e0f8..7f4728d300b32ede49d17eb5dc57bae9fe32d6f6 100644 (file)
@@ -43,7 +43,7 @@
     
     IBOutlet NSMenu * fContextRow, * fContextNoRow;
     
-    NSInteger fMouseRow, fMouseControlRow, fMouseRevealRow, fMouseActionRow, fActionPushedRow;
+    NSInteger fMouseRow, fMouseControlRow, fMouseRevealRow, fMouseActionRow;
     NSArray * fSelectedValues;
     
     IBOutlet NSMenu * fActionMenu, * fUploadMenu, * fDownloadMenu, * fRatioMenu, * fPriorityMenu;
index 03c753eca24bf89fda96c8af47b06754d3f830b8..770557c0f13f7ddb4f7194d3b801a8ad8b800552 100644 (file)
@@ -73,8 +73,6 @@
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
         fMouseActionRow = -1;
-        #warning we can get rid of the on 10.7
-        fActionPushedRow = -1;
         
         fActionPopoverShown = NO;
         
             [cell setControlHover: row == fMouseControlRow];
             [cell setRevealHover: row == fMouseRevealRow];
             [cell setActionHover: row == fMouseActionRow];
-            [cell setActionPushed: row == fActionPushedRow];
         }
     }
     else
     //avoid weird behavior when showing menu by doing this after mouse down
     if (row != -1 && fMouseActionRow == row)
     {
-        if (![NSApp isOnLionOrBetter])
-        {
-            fActionPushedRow = row;
-            [self setNeedsDisplayInRect: [self rectOfRow: row]]; //ensure button is pushed down
-        }
-        
         #warning maybe make appear on mouse down
         [self displayTorrentActionPopoverForEvent: event];
-        
-        if (![NSApp isOnLionOrBetter])
-        {
-            fActionPushedRow = -1;
-            [self setNeedsDisplayInRect: [self rectOfRow: row]];
-        }
     }
     else if (!pushed && [event clickCount] == 2) //double click
     {
     NSURL * url;
     if ((url = [NSURL URLFromPasteboard: [NSPasteboard generalPasteboard]]))
         [fController openURL: [url absoluteString]];
-    else if ([NSApp isOnLionOrBetter])
+    else
     {
         NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
         if (items)
         {
-            NSDataDetector * detector = [NSDataDetectorLion dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
+            NSDataDetector * detector = [NSDataDetector dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
             for (NSString * pbItem in items)
             {
                 pbItem = [pbItem stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
     {
         if ([[[NSPasteboard generalPasteboard] types] containsObject: NSURLPboardType])
             return YES;
-        
-        if ([NSApp isOnLionOrBetter])
+
+        NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
+        if (items)
         {
-            NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
-            if (items)
+            NSDataDetector * detector = [NSDataDetector dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
+            for (NSString * pbItem in items)
             {
-                NSDataDetector * detector = [NSDataDetectorLion dataDetectorWithTypes: NSTextCheckingTypeLink error: nil];
-                for (NSString * pbItem in items)
-                {
-                    pbItem = [pbItem stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
-                    if (([pbItem rangeOfString: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)].location != NSNotFound)
-                        || [detector firstMatchInString: pbItem options: 0 range: NSMakeRange(0, [pbItem length])])
-                        return YES;
-                }
+                pbItem = [pbItem stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+                if (([pbItem rangeOfString: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)].location != NSNotFound)
+                    || [detector firstMatchInString: pbItem options: 0 range: NSMakeRange(0, [pbItem length])])
+                    return YES;
             }
         }
-        
-        return NO;
+    
+    return NO;
     }
     
     return YES;
         return;
     
     const NSRect rect = [fTorrentCell iconRectForBounds: [self rectOfRow: row]];
+
+    if (fActionPopoverShown)
+        return;
     
-    if ([NSApp isOnLionOrBetter])
-    {
-        if (fActionPopoverShown)
-            return;
-        
-        Torrent * torrent = [self itemAtRow: row];
-        
-        NSPopover * popover = [[NSPopoverLion alloc] init];
-        [popover setBehavior: NSPopoverBehaviorTransient];
-        InfoOptionsViewController * infoViewController = [[InfoOptionsViewController alloc] init];
-        [popover setContentViewController: infoViewController];
-        [popover setDelegate: self];
-        
-        [popover showRelativeToRect: rect ofView: self preferredEdge: NSMaxYEdge];
-        [infoViewController setInfoForTorrents: [NSArray arrayWithObject: torrent]];
-        [infoViewController updateInfo];
-        
-        [infoViewController release];
-        [popover release];
-    }
-    else
-    {
-        //update file action menu
-        fMenuTorrent = [[self itemAtRow: row] retain];
-        
-        //update global limit check
-        [fGlobalLimitItem setState: [fMenuTorrent usesGlobalSpeedLimit] ? NSOnState : NSOffState];
-        
-        //place menu below button
-        NSPoint location = rect.origin;
-        location.y += NSHeight(rect) + 5.0;
-        
-        location = [self convertPoint: location toView: self];
-        [fActionMenu popUpMenuPositioningItem: nil atLocation: location inView: self];
-        
-        [fMenuTorrent release];
-        fMenuTorrent = nil;
-    }
+    Torrent * torrent = [self itemAtRow: row];
+    
+    NSPopover * popover = [[NSPopover alloc] init];
+    [popover setBehavior: NSPopoverBehaviorTransient];
+    InfoOptionsViewController * infoViewController = [[InfoOptionsViewController alloc] init];
+    [popover setContentViewController: infoViewController];
+    [popover setDelegate: self];
+    
+    [popover showRelativeToRect: rect ofView: self preferredEdge: NSMaxYEdge];
+    [infoViewController setInfoForTorrents: [NSArray arrayWithObject: torrent]];
+    [infoViewController updateInfo];
+    
+    [infoViewController release];
+    [popover release];
 }
 
 //don't show multiple popovers when clicking the gear button repeatedly
index eb5f5d0a1bc8ddd9f539842ddf7af66a279c79f0..0d30e31a43a2af0fded8dcf665d2eb3cdcfc359b 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Status for valgte filer" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Brug grupper" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Sorter overførsler efter" id="1638">
-                    <menu key="submenu" title="Sorter overførsler efter" id="1639">
-                        <items>
-                            <menuItem title="Kø" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Aktivitet" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tilføjelsesdato" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Navn" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Fremskridt" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Størrelse" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tilstand" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Stigende" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Faldende" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Download hastighed" id="1059">
-                    <menu key="submenu" title="Download hastighed" id="1060">
-                        <items>
-                            <menuItem title="Ubegrænset" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Upload hastighed" id="1044">
-                    <menu key="submenu" title="Upload hastighed" id="1045">
-                        <items>
-                            <menuItem title="Ubegrænset" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Stop deling ved delingsforhold" id="1309">
-                    <menu key="submenu" title="Stop deling ved delingsforhold" id="1310">
-                        <items>
-                            <menuItem title="Del altid" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="stop ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Priotet" id="3196">
index 68d24d7a0e755c12ecea59290f116ca39a985f23..2e16779f9cbe8382a377659b42afe2ea33c5873e 100644 (file)
@@ -708,20 +708,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -730,9 +723,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -869,154 +859,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Status der ausgewählten Übertragungen" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Gruppen verwenden" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Sortieren nach" id="1638">
-                    <menu key="submenu" title="Sortieren nach" id="1639">
-                        <items>
-                            <menuItem title="Position in Warteliste" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Aktivität" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Hinzugefügt" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Name" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Fortschritt" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Größe" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Status" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Aufsteigend" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Absteigend" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Empfangsbegrenzung" id="1059">
-                    <menu key="submenu" title="Empfangsbegrenzung" id="1060">
-                        <items>
-                            <menuItem title="Unbegrenzt" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Sendebegrenzung" id="1044">
-                    <menu key="submenu" title="Sendebegrenzung" id="1045">
-                        <items>
-                            <menuItem title="Unbegrenzt" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Verteilen anhalten" id="1309">
-                    <menu key="submenu" title="Verteilen anhalten" id="1310">
-                        <items>
-                            <menuItem title="Nie" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="stop ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Priorität" id="3196">
index 4af95775084f976f94c4e7e501cca01225e9e02e..6e34678f3c5f4f5e4dc8e2746c6de312e5bee110 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Status of Selected Files" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Use Groups" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Sort Transfers By" id="1638">
-                    <menu key="submenu" title="Sort Transfers By" id="1639">
-                        <items>
-                            <menuItem title="Queue Order" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Activity" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Date Added" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Name" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Progress" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Size" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="State" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Ascending" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Descending" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Download Bandwidth Limit" id="1059">
-                    <menu key="submenu" title="Download Bandwidth Limit" id="1060">
-                        <items>
-                            <menuItem title="Unlimited" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Upload Bandwidth Limit" id="1044">
-                    <menu key="submenu" title="Upload Bandwidth Limit" id="1045">
-                        <items>
-                            <menuItem title="Unlimited" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Stop Seeding at Ratio" id="1309">
-                    <menu key="submenu" title="Stop Seeding at Ratio" id="1310">
-                        <items>
-                            <menuItem title="Seed Forever" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="stop ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Priority" id="3196">
index d57cb1b21594cbacddf78e5ce9dc31b12b1c6aeb..11936a3a8becc860ef148b81ebf03d950982dd25 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Estado de los archivos seleccionados" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Usar grupos" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Ordenar tareas por" id="1638">
-                    <menu key="submenu" title="Ordenar tareas por" id="1639">
-                        <items>
-                            <menuItem title="Orden de cola" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Actividad" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Fecha añadido" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Nombre" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Progreso" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tamaño" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tamaño" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Invertir orden" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Descendente" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Ratio de descarga" id="1059">
-                    <menu key="submenu" title="Ratio de descarga" id="1060">
-                        <items>
-                            <menuItem title="Ilimitado" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limitado" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Ratio de subida" id="1044">
-                    <menu key="submenu" title="Ratio de subida" id="1045">
-                        <items>
-                            <menuItem title="Ilimitado" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limitado" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Parar de compartir con ratio" id="1309">
-                    <menu key="submenu" title="Parar de compartir con ratio" id="1310">
-                        <items>
-                            <menuItem title="Compartir siempre" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Parar con ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menú" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Prioridad" id="3196">
index 79cf00ab163793c48743021688b8f1c43fe7c670..83a09089a1bf28f7a03578a707da0c8b7f3ba0a9 100644 (file)
@@ -706,20 +706,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -728,9 +721,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -867,154 +857,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="État des fichiers sélectionnés" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Utiliser les groupes" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Trier les transferts par" id="1638">
-                    <menu key="submenu" title="Trier les transferts par" id="1639">
-                        <items>
-                            <menuItem title="File d'attente" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Activité" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Date d'ajout" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Nom" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Progression" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Taille" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="État" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Trackeur" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Inverser l'ordre de tri" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Descendant" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Limite de téléchargement" id="1059">
-                    <menu key="submenu" title="Limite de téléchargement" id="1060">
-                        <items>
-                            <menuItem title="Illimité" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limité" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Limite d'envoi" id="1044">
-                    <menu key="submenu" title="Limite d'envoi" id="1045">
-                        <items>
-                            <menuItem title="Illimité" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limité" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Arrêter l'envoi" id="1309">
-                    <menu key="submenu" title="Arrêter l'envoi" id="1310">
-                        <items>
-                            <menuItem title="Jamais" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Arrêter au ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Priorité" id="3196">
index 61e6e70258908ff469eacf1a6c5938df58688dfe..b2aae08563242fdd79edd8b5407d6573e1576263 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Stato dei file selezionati" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Usa gruppi" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Ordina trasferimenti per" id="1638">
-                    <menu key="submenu" title="Ordina trasferimenti per" id="1639">
-                        <items>
-                            <menuItem title="Ordine coda" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Attività" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Data inserimento" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Nome" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Avanzamento" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Dimensione" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Stato" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Server traccia" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Crescente" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Decrescente" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Limite banda di ricezione" id="1059">
-                    <menu key="submenu" title="Limite banda di ricezione" id="1060">
-                        <items>
-                            <menuItem title="Non limitata" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limitata" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Limite banda di invio" id="1044">
-                    <menu key="submenu" title="Limite banda di invio" id="1045">
-                        <items>
-                            <menuItem title="Non limitata" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Limitata" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Ferma distribuzione al rapporto" id="1309">
-                    <menu key="submenu" title="Ferma distribuzione al rapporto" id="1310">
-                        <items>
-                            <menuItem title="Sempre in distribuzione" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Ferma al rapporto" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Priorità" id="3196">
index e82f136c93d78030d61081d2e08af2fd2e8c5640..246eba9c45e6b2c82c3f56e216b237578e502368 100644 (file)
@@ -706,20 +706,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -728,9 +721,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -867,154 +857,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Status van geselecteerde bestanden" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Toon groepen" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Sorteer transfers op" id="1638">
-                    <menu key="submenu" title="Sorteer transfers op" id="1639">
-                        <items>
-                            <menuItem title="Rij volgorde" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Activiteit" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Datum van toevoeging" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Naam" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Voortgang" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Grootte" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Status" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Oplopend" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Aflopend" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Globale downloadsnelheid" id="1059">
-                    <menu key="submenu" title="Globale downloadsnelheid" id="1060">
-                        <items>
-                            <menuItem title="Onbeperkt" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Beperk" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Globale uploadsnelheid" id="1044">
-                    <menu key="submenu" title="Globale uploadsnelheid" id="1045">
-                        <items>
-                            <menuItem title="Onbeperkt" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Beperk" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Stop seeden bij ratio" id="1309">
-                    <menu key="submenu" title="Stop seeden bij ratio" id="1310">
-                        <items>
-                            <menuItem title="Seed onophoudelijk" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="stop ratio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Prioriteit" id="3196">
index 9d3ac53df5658885475278d0282cea5908d77e5e..30d737ea491473a82366ae85b3c102230175a565 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Estado dos ficheiros seleccionados" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Usar grupos" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Ordenar transferências por" id="1638">
-                    <menu key="submenu" title="Ordenar transferências por" id="1639">
-                        <items>
-                            <menuItem title="Posição na fila de espera" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Actividade" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Data de adição" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Nome" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Progresso" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tamanho" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Estado" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Tracker" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Ascendente" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Descendente" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Limite de velocidade de recepção" id="1059">
-                    <menu key="submenu" title="Limite de velocidade de recepção" id="1060">
-                        <items>
-                            <menuItem title="Ilimitado" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limite" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Limite de velocidade de envio" id="1044">
-                    <menu key="submenu" title="Limite de velocidade de envio" id="1045">
-                        <items>
-                            <menuItem title="Ilimitado" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limite" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Parar de enviar no rácio" id="1309">
-                    <menu key="submenu" title="Parar de enviar no rácio" id="1310">
-                        <items>
-                            <menuItem title="Não parar de enviar" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="parar no rácio" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Prioridade" id="3196">
index 892c5ac8fa7c361a4ddd2e3b783b44f55b66f68c..0a1d3544ca3a5e375242b0f05678abbb05d03043 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,154 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Статус выбранных файлов" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Использовать группы" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Сортировать раздачи по" id="1638">
-                    <menu key="submenu" title="Сортировать раздачи по" id="1639">
-                        <items>
-                            <menuItem title="Порядку в очереди" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Активности" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Дате добавления" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Имени" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Прогрессу" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Размеру" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Состоянию" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Трекеру" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Возрастающей" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Убывающей" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Общая скорость скачивания" id="1059">
-                    <menu key="submenu" title="Общая скорость скачивания" id="1060">
-                        <items>
-                            <menuItem title="Без ограничений" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="С ограничением (? КБ/с)" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Общая скорость раздачи" id="1044">
-                    <menu key="submenu" title="Общая скорость раздачи" id="1045">
-                        <items>
-                            <menuItem title="Без ограничений" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="С ограничением (? КБ/с)" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Остановить при рейтинге" id="1309">
-                    <menu key="submenu" title="Остановить при рейтинге" id="1310">
-                        <items>
-                            <menuItem title="Не останавливать" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="остановить при рейтинге" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Приоритет" id="3196">
index 3d4a7e06173fad6be2811b657caa8c7864e27e7d..b22bdc344e8c97059c3e8ea4470617b60b055f37 100644 (file)
@@ -707,20 +707,13 @@ CA
         <customObject id="206" userLabel="Controller" customClass="Controller">
             <connections>
                 <outlet property="fActionButton" destination="3435" id="3438"/>
-                <outlet property="fActionMenu" destination="1041" id="3434"/>
-                <outlet property="fCheckRatioItem" destination="1317" id="3043"/>
                 <outlet property="fClearCompletedButton" destination="3420" id="3425"/>
-                <outlet property="fDownloadLimitItem" destination="1068" id="1464"/>
-                <outlet property="fDownloadMenu" destination="1060" id="1456"/>
-                <outlet property="fDownloadNoLimitItem" destination="1070" id="1463"/>
                 <outlet property="fGroupsSetContextMenu" destination="2850" id="2855"/>
                 <outlet property="fGroupsSetMenu" destination="2840" id="2843"/>
                 <outlet property="fNextFilterItem" destination="1797" id="1801"/>
                 <outlet property="fNextInfoTabItem" destination="1693" id="1703"/>
-                <outlet property="fNoCheckRatioItem" destination="1316" id="3044"/>
                 <outlet property="fOpenIgnoreDownloadFolder" destination="1680" id="1682"/>
                 <outlet property="fPrevInfoTabItem" destination="1694" id="1704"/>
-                <outlet property="fRatioStopMenu" destination="1310" id="3076"/>
                 <outlet property="fShareContextMenu" destination="lvU-Va-GzM" id="TN5-xV-ApO"/>
                 <outlet property="fShareContextMenuItem" destination="8t6-wh-5UW" id="f1v-KF-xYb"/>
                 <outlet property="fShareMenu" destination="Cay-iU-bH4" id="nHs-6t-KFn"/>
@@ -729,9 +722,6 @@ CA
                 <outlet property="fSpeedLimitButton" destination="2690" id="2703"/>
                 <outlet property="fTableView" destination="3091" id="3118"/>
                 <outlet property="fTotalTorrentsField" destination="2700" id="2702"/>
-                <outlet property="fUploadLimitItem" destination="1046" id="1466"/>
-                <outlet property="fUploadMenu" destination="1045" id="1455"/>
-                <outlet property="fUploadNoLimitItem" destination="1058" id="1465"/>
                 <outlet property="fWindow" destination="21" id="246"/>
             </connections>
         </customObject>
@@ -868,155 +858,6 @@ CA
         </menu>
         <customObject id="1812" userLabel="SUUpdater" customClass="SUUpdater"/>
         <userDefaultsController representsSharedInstance="YES" id="1815" userLabel="Shared Defaults"/>
-        <menu title="ActionMenu" id="1041" userLabel="ActionMenu">
-            <items>
-                <menuItem title="Seçili Dosyaların Durumu" id="3163">
-                    <connections>
-                        <action selector="toggleStatusString:" target="206" id="3165"/>
-                    </connections>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="3164">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Öbekleri Kullan" id="3080">
-                    <connections>
-                        <action selector="setSortByGroup:" target="206" id="3081"/>
-                    </connections>
-                </menuItem>
-                <menuItem title="Aktarımları Sırala" id="1638">
-                    <menu key="submenu" title="Aktarımları Sırala" id="1639">
-                        <items>
-                            <menuItem title="Sıraya Göre" id="1646">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1657"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Etkinlik" tag="6" id="2326">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="2327"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Ekleme Tarihi" tag="1" id="1642">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1653"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Ad" tag="2" id="1643">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1654"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="İndirme Durumu" tag="3" id="1644">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1655"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Boyut" tag="7" id="1645">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1656"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Durum" tag="4" id="3432">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="3433"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="İzleyici" tag="5" id="1930">
-                                <connections>
-                                    <action selector="setSort:" target="206" id="1931"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="2883">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                            <menuItem title="Artan" id="1884">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="1887"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Azalan" tag="1" id="3403">
-                                <connections>
-                                    <action selector="setSortReverse:" target="206" id="3404"/>
-                                </connections>
-                            </menuItem>
-                        </items>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1641">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="İndirme Bant Genişliği Limiti" id="1059">
-                    <menu key="submenu" title="İndirme Bant Genişliği Limiti" id="1060">
-                        <items>
-                            <menuItem title="Unlimited" id="1070">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1426"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1068">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1427"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1064">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3074"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem title="Gönderme Bant Genişliği Limiti" id="1044">
-                    <modifierMask key="keyEquivalentModifierMask"/>
-                    <menu key="submenu" title="Gönderme Bant Genişliği Limiti" id="1045">
-                        <items>
-                            <menuItem title="Unlimited" id="1058">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1424"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="limit" id="1046">
-                                <connections>
-                                    <action selector="setLimitGlobalEnabled:" target="206" id="1425"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1048">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3073"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-                <menuItem isSeparatorItem="YES" id="1341">
-                    <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                </menuItem>
-                <menuItem title="Beslemenin Duracağı Oran" id="1309">
-                    <menu key="submenu" title="Beslemenin Duracağı Oran" id="1310">
-                        <items>
-                            <menuItem title="Sürekli Besle" id="1316">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3042"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="durma oranı" id="1317">
-                                <connections>
-                                    <action selector="setRatioGlobalEnabled:" target="206" id="3041"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem isSeparatorItem="YES" id="1318">
-                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                            </menuItem>
-                        </items>
-                        <connections>
-                            <outlet property="delegate" destination="206" id="3075"/>
-                        </connections>
-                    </menu>
-                </menuItem>
-            </items>
-        </menu>
         <menu title="Menu" autoenablesItems="NO" id="1936" userLabel="TorrentActionMenu">
             <items>
                 <menuItem title="Öncelik" id="3196">