From d3e8165c830ab35869740f9d2420ba49c8e1d4d2 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Wed, 17 Dec 2008 02:19:14 +0000 Subject: [PATCH] cleanup for the group menu filling adjustment --- NEWS | 1 + Transmission.xcodeproj/project.pbxproj | 6 ------ macosx/AddWindowController.m | 1 - macosx/Controller.m | 28 +++++++++----------------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index d45204fde..92a37b635 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ NEWS file for Transmission - All Platforms + Support BitTorrent Enhancement Proposal #6 "Fast Extension" + Support BitTorrent Enhancement Proposal #21 "Extension for Partial Seeds" + + Random port, with optional randomization on startup - Mac + Groups (moved to preferences) can be auto-assigned to transfers when adding based on name and tracker (10.5-only) + Groups can have a default location when adding transfers diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index e134b6666..59faadf4d 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -105,7 +105,6 @@ A232F07E0EEA034A00041646 /* BonjourController.m in Sources */ = {isa = PBXBuildFile; fileRef = A232F07D0EEA034A00041646 /* BonjourController.m */; }; A233BD330D8C6585007EE7B4 /* MessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD320D8C6585007EE7B4 /* MessageWindow.xib */; }; A233BD690D8CF2C7007EE7B4 /* StatsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */; }; - A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */; }; A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; }; A2399CCD0CD3852300225B2B /* NSApplicationAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A2399CCC0CD3852300225B2B /* NSApplicationAdditions.m */; }; A23A0E310EECB0740091C885 /* GroupRules.xib in Resources */ = {isa = PBXBuildFile; fileRef = A23A0E300EECB0740091C885 /* GroupRules.xib */; }; @@ -506,8 +505,6 @@ A232F07D0EEA034A00041646 /* BonjourController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BonjourController.m; path = macosx/BonjourController.m; sourceTree = ""; }; A233BD320D8C6585007EE7B4 /* MessageWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MessageWindow.xib; path = macosx/MessageWindow.xib; sourceTree = ""; }; A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = StatsWindow.xib; path = macosx/StatsWindow.xib; sourceTree = ""; }; - A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSMenuAdditions.h; path = macosx/NSMenuAdditions.h; sourceTree = ""; }; - A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSMenuAdditions.m; path = macosx/NSMenuAdditions.m; sourceTree = ""; }; A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = ""; }; A2385DD30BFE06C800B24EF6 /* DragOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayWindow.h; path = macosx/DragOverlayWindow.h; sourceTree = ""; }; A2399CCB0CD3852300225B2B /* NSApplicationAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSApplicationAdditions.h; path = macosx/NSApplicationAdditions.h; sourceTree = ""; }; @@ -1248,8 +1245,6 @@ 4DE5CC9C0980656F00BE280E /* NSStringAdditions.m */, A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */, A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */, - A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */, - A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */, ); name = Additions; sourceTree = ""; @@ -1903,7 +1898,6 @@ A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */, 35F373030C2DA89000DAA8F2 /* FilePriorityCell.m in Sources */, A2085DDC0C53BC74000BC3B7 /* AboutWindowController.m in Sources */, - A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */, A21282A80CA6C66800EAEE0F /* StatusBarView.m in Sources */, A257C1820CAD3003004E121C /* PeerTableView.m in Sources */, A2E23AC60CB5E1930002BB25 /* InfoTabButtonCell.m in Sources */, diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m index 03e9e983b..82a649a3a 100644 --- a/macosx/AddWindowController.m +++ b/macosx/AddWindowController.m @@ -27,7 +27,6 @@ #import "Controller.h" #import "GroupsController.h" #import "NSStringAdditions.h" -#import "NSMenuAdditions.h" #import "NSApplicationAdditions.h" #import "ExpandedPathToIconTransformer.h" diff --git a/macosx/Controller.m b/macosx/Controller.m index 4940ad4b9..d34c3913c 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2283,28 +2283,20 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy - (void) menuNeedsUpdate: (NSMenu *) menu { - if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu) + if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu || menu == fGroupFilterMenu) { - for (NSInteger i = [menu numberOfItems]-1; i >= 0; i--) + const BOOL filter = menu == fGroupFilterMenu; + + const NSInteger remaining = filter ? 3 : 0; + for (NSInteger i = [menu numberOfItems]-1; i >= remaining; i--) [menu removeItemAtIndex: i]; - NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO]; - const NSInteger groupMenuCount = [groupMenu numberOfItems]; - for (NSInteger i = 0; i < groupMenuCount; i++) - { - NSMenuItem * item = [[groupMenu itemAtIndex: 0] retain]; - [groupMenu removeItemAtIndex: 0]; - [menu addItem: item]; - [item release]; - } - } - else if (menu == fGroupFilterMenu) - { - for (NSInteger i = [menu numberOfItems]-1; i >= 3; i--) - [menu removeItemAtIndex: i]; + NSMenu * groupMenu; + if (filter) + groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO]; + else + groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:) isSmall: YES]; - NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:) - isSmall: YES]; const NSInteger groupMenuCount = [groupMenu numberOfItems]; for (NSInteger i = 0; i < groupMenuCount; i++) {