From 70793c23dddc8638914287a19932f3ff8e767b28 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 31 Jan 2010 21:26:45 +0000 Subject: [PATCH] #2835 remove file selection in action menu --- macosx/TorrentTableView.m | 55 ------------------------------------ macosx/en.lproj/MainMenu.xib | 36 ++++++----------------- 2 files changed, 8 insertions(+), 83 deletions(-) diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index b624f168a..e0f4149ee 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -48,8 +48,6 @@ - (void) setGroupStatusColumns; -- (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files; - @end @implementation TorrentTableView @@ -546,18 +544,9 @@ if (row < 0) return; - const NSInteger numberOfNonFileItems = [fActionMenu numberOfItems]; - //update file action menu fMenuTorrent = [[self itemAtRow: row] retain]; - //show/hide the file divider - const BOOL isFolder = [fMenuTorrent isFolder]; - [[fActionMenu itemAtIndex: numberOfNonFileItems-1] setHidden: !isFolder]; - - if (isFolder) - [self createFileMenu: fActionMenu forFiles: [fMenuTorrent fileList]]; - //update global limit check [fGlobalLimitItem setState: [fMenuTorrent usesGlobalSpeedLimit] ? NSOnState : NSOffState]; @@ -581,9 +570,6 @@ [NSMenu popUpContextMenu: fActionMenu withEvent: newEvent forView: self]; } - for (NSInteger i = [fActionMenu numberOfItems]-1; i >= numberOfNonFileItems; i--) - [fActionMenu removeItemAtIndex: i]; - [fMenuTorrent release]; fMenuTorrent = nil; } @@ -669,15 +655,6 @@ item = [menu itemWithTag: ACTION_MENU_PRIORITY_LOW_TAG]; [item setState: priority == TR_PRI_LOW ? NSOnState : NSOffState]; } - else //assume the menu is part of the file list - { - if ([menu numberOfItems] > 0) - return; - - NSMenu * supermenu = [menu supermenu]; - [self createFileMenu: menu forFiles: [(FileListNode *)[[supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: menu]] - representedObject] children]]; - } } //alternating rows - first row after group row is white @@ -905,36 +882,4 @@ [[self tableColumnWithIdentifier: @"DL Image"] setHidden: ratio]; } -- (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files -{ - for (FileListNode * node in files) - { - NSString * name = [node name]; - - NSMenuItem * item = [[NSMenuItem alloc] initWithTitle: name action: @selector(checkFile:) keyEquivalent: @""]; - - if ([node isFolder]) - { - NSMenu * itemMenu = [[NSMenu alloc] initWithTitle: name]; - [itemMenu setAutoenablesItems: NO]; - [item setSubmenu: itemMenu]; - [itemMenu setDelegate: self]; - [itemMenu release]; - } - - [item setRepresentedObject: node]; - - NSImage * icon = [node icon]; - [icon setSize: NSMakeSize(16.0, 16.0)]; - [item setImage: icon]; - - NSIndexSet * indexSet = [node indexes]; - [item setState: [fMenuTorrent checkForFiles: indexSet]]; - [item setEnabled: [fMenuTorrent canChangeDownloadCheckForFiles: indexSet]]; - - [menu addItem: item]; - [item release]; - } -} - @end diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib index 15c638614..48101b27c 100644 --- a/macosx/en.lproj/MainMenu.xib +++ b/macosx/en.lproj/MainMenu.xib @@ -12,10 +12,11 @@ YES + + + - - YES @@ -416,9 +417,9 @@ uF1MuF0d31394F4LFIkD59u9u5SF29tt3D6d5kI1090F4V6N6V6d6g8RSF69593d3UFovl3l6t796QgI AA8BAAADAAAAAQA+AAABAQADAAAAAQA+AAABAgADAAAABAAAJNIBAwADAAAAAQAFAAABBgADAAAAAQAC AAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAEAAABFgADAAAAAQA+AAABFwAEAAAAAQAA JBABHAADAAAAAQABAAABPQADAAAAAQACAAABUgADAAAAAQABAAABUwADAAAABAAAJNqHcwAHAAAoQAAA -JOIAAAAAAAgACAAIAAgAAQABAAEAAQAAKEBhcHBsAgAAAG1udHJSR0IgWFlaIAfZAAgAHAASABUAJWFj -c3BBUFBMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbNyPwG1i+VmcTdMqo0kS -h5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXJYWVoAAAFQAAAAFGdYWVoAAAFkAAAAFGJY +JOIAAAAAAAgACAAIAAgAAQABAAEAAQAAKEBhcHBsAgAAAG1udHJSR0IgWFlaIAfaAAEAAgATABsAGGFj +c3BBUFBMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbDNKw7X760UhC6e2eZMW +kx0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXJYWVoAAAFQAAAAFGdYWVoAAAFkAAAAFGJY WVoAAAF4AAAAFHd0cHQAAAGMAAAAFGNoYWQAAAGgAAAALHJUUkMAAAHMAAAIDGdUUkMAAAnYAAAIDGJU UkMAABHkAAAIDGFhcmcAABnwAAAAIGFhZ2cAABoQAAAAIGFhYmcAABowAAAAIHZjZ3QAABpQAAAGEm5k aW4AACBkAAAGPmRlc2MAACakAAAAX2RzY20AACcEAAAA8G1tb2QAACf0AAAAKGNwcnQAACgcAAAAJFhZ @@ -588,7 +589,7 @@ AAgAAADoZnJGUgAAAAgAAADocHRCUgAAAAgAAADocHRQVAAAAAgAAADoemhDTgAAAAgAAADoZXNFUwAA AAgAAADoamFKUAAAAAgAAADocnVSVQAAAAgAAADoc3ZTRQAAAAgAAADoemhUVwAAAAgAAADoZGVERQAA AAgAAADoZmlGSQAAAAgAAADoaXRJVAAAAAgAAADoa29LUgAAAAgAAADoAGkATQBhAGNtbW9kAAAAAAAA BhAAAJxqAAAAAL/TkYAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUsIEluYy4s -IDIwMDkAA +IDIwMTAAA NSCalibratedRGBColorSpace 8 @@ -3309,17 +3310,6 @@ IDIwMDkAA - - - YES - YES - - - 1048576 - 2147483647 - - - YES @@ -6427,7 +6417,6 @@ IDIwMDkAA - @@ -6957,11 +6946,6 @@ IDIwMDkAA - - 3148 - - - 1282 @@ -7610,8 +7594,6 @@ IDIwMDkAA 3140.IBPluginDependency 3145.IBPluginDependency 3146.IBPluginDependency - 3148.IBPluginDependency - 3148.ImportedFromIB2 3163.IBPluginDependency 3163.ImportedFromIB2 3164.IBPluginDependency @@ -7990,7 +7972,7 @@ IDIwMDkAA com.apple.InterfaceBuilder.CocoaPlugin - {{209, 474}, {310, 133}} + {{209, 484}, {310, 123}} com.apple.InterfaceBuilder.CocoaPlugin {{381, 469}, {214, 113}} @@ -8225,8 +8207,6 @@ IDIwMDkAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin