Changeset 2879

Timestamp:

Aug 20, 2007, 4:49:53 PM (15 years ago)

Author:

livings124

Message:

add a menu additions class

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (7 diffs)
• macosx/NSMenuAdditions.h (added)
• macosx/NSMenuAdditions.m (added)
• macosx/TorrentTableView.m (modified) (5 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -72 +72 @@
                 A22BC9A30C5BBCF100F5FB72 /* BottomBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A22BC9A20C5BBCF100F5FB72 /* BottomBorder.png */; };
                 A232D29E0A70903E00973B12 /* Filter.png in Resources */ = {isa = PBXBuildFile; fileRef = A232D29D0A70903E00973B12 /* Filter.png */; };
+                A234D0D10C79FB3600A82373 /* NSMenuAdditions.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */; };
+                A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */; };
                 A2385DD40BFE06C800B24EF6 /* DragOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */; };
                 A23BBEB70A9BBE77003F7274 /* FilterBarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A27431D90A68538400FA780A /* FilterBarButton.m */; };
@@ -277 +279 @@
                                 A261F1E40A69A1B10002815A /* Growl.framework in CopyFiles */,
                                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */,
+                                A234D0D10C79FB3600A82373 /* NSMenuAdditions.h in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -396 +399 @@
                 A22BCA330C5D5CDA00F5FB72 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path = macosx/Italian.lproj/PrefsWindow.nib; sourceTree = "<group>"; };
                 A232D29D0A70903E00973B12 /* Filter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Filter.png; path = macosx/Images/Filter.png; sourceTree = "<group>"; };
+                A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSMenuAdditions.h; path = macosx/NSMenuAdditions.h; sourceTree = "<group>"; };
+                A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSMenuAdditions.m; path = macosx/NSMenuAdditions.m; sourceTree = "<group>"; };
                 A2385DD20BFE06C800B24EF6 /* DragOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DragOverlayWindow.m; path = macosx/DragOverlayWindow.m; sourceTree = "<group>"; };
                 A2385DD30BFE06C800B24EF6 /* DragOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayWindow.h; path = macosx/DragOverlayWindow.h; sourceTree = "<group>"; };
@@ -692 +697 @@
                                 4DE5CCA50980735700BE280E /* Badger.h */,
                                 4DE5CCA60980735700BE280E /* Badger.m */,
-                                4DE5CC9B0980656F00BE280E /* NSStringAdditions.h */,
-                                4DE5CC9C0980656F00BE280E /* NSStringAdditions.m */,
-                                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */,
-                                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */,
                                 A256588A0A9A695400E8A03B /* MessageWindowController.h */,
                                 A256588B0A9A695400E8A03B /* MessageWindowController.m */,
@@ -702 +703 @@
                                 A2085DD90C53BC74000BC3B7 /* AboutWindowController.h */,
                                 A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */,
+                                A234D0D40C79FB6000A82373 /* Additions */,
                                 E1B6FBF80C0D719B0015FE4D /* Info Window */,
                                 E1B6FBFD0C0D72430015FE4D /* Prefs Window */,
@@ -926 +928 @@
                         sourceTree = "<group>";
                 };
+                A234D0D40C79FB6000A82373 /* Additions */ = {
+                        isa = PBXGroup;
+                        children = (
+                                4DE5CC9B0980656F00BE280E /* NSStringAdditions.h */,
+                                4DE5CC9C0980656F00BE280E /* NSStringAdditions.m */,
+                                A215760A0C0D449A0057A26A /* NSBezierPathAdditions.h */,
+                                A21576090C0D449A0057A26A /* NSBezierPathAdditions.m */,
+                                A234D0CF0C79FB3600A82373 /* NSMenuAdditions.h */,
+                                A234D0D00C79FB3600A82373 /* NSMenuAdditions.m */,
+                        );
+                        name = Additions;
+                        sourceTree = "<group>";
+                };
                 BE75C3570C72A0D600DBEFE0 /* libevent */ = {
                         isa = PBXGroup;
@@ -1456 +1471 @@
                                 35F373030C2DA89000DAA8F2 /* FilePriorityCell.m in Sources */,
                                 A2085DDC0C53BC74000BC3B7 /* AboutWindowController.m in Sources */,
+                                A234D0D20C79FB3600A82373 /* NSMenuAdditions.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/TorrentTableView.m

@@ -27 +27 @@
 #import "Controller.h"
 #import "Torrent.h"
+#import "NSMenuAdditions.h"
 
 #define PADDING 3.0
@@ -53 +54 @@
 
 - (void) updateFileMenu: (NSMenu *) menu forFiles: (NSArray *) files;
-
-- (void) moveItemsFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range toMenu: (NSMenu *) newMenu;
 
 @end
@@ -320 +319 @@
     //add file menu items to action menu
     NSRange range = NSMakeRange(0, [fileMenu numberOfItems]);
-    [self moveItemsFromMenu: fileMenu inRange: range toMenu: fActionMenu];
+    [fActionMenu moveItemsToEndFromMenu: fileMenu inRange: range];
     
     //place menu below button
@@ -336 +335 @@
     //move file menu items back to the torrent's file menu
     range.location = [fActionMenu numberOfItems] - range.length;
-    [self moveItemsFromMenu: fActionMenu inRange: range toMenu: fileMenu];
+    [fileMenu moveItemsToEndFromMenu: fActionMenu inRange: range];
     
     [fMenuTorrent release];
@@ -636 +635 @@
 }
 
-#warning move to additions
-- (void) moveItemsFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range toMenu: (NSMenu *) newMenu
-{
-    NSMenuItem * item;
-    int i;
-    for (i=0; i<range.length; i++)
-    {
-        item = [[oldMenu itemAtIndex: range.location] retain];
-        [oldMenu removeItem: item];
-        [newMenu addItem: item];
-        [item release];
-    }
-}
-
 @end