Changeset 771 for trunk

Timestamp:

Aug 14, 2006, 3:13:34 AM (16 years ago)

Author:

livings124

Message:

No need to make peer table make the window key, which also eliminates the need for a subclass.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/English.lproj/InfoWindow.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/FileTableView.h (modified) (1 diff)
• macosx/FileTableView.m (modified) (1 diff)
• macosx/InfoTableView.h (deleted)
• macosx/InfoTableView.m (deleted)
• macosx/Torrent.m (modified) (2 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -82 +82 @@
                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
                 A21DFF100A292B2B007C5F76 /* Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = A21DFF0F0A292B2B007C5F76 /* Transfers.png */; };
-                A221DA8A0A8F7E7E0011E98E /* InfoTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A221DA880A8F7E7E0011E98E /* InfoTableView.m */; };
                 A2305A800A3DC9E400AB2D77 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */; };
                 A2305A810A3DC9E400AB2D77 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */; };
@@ -286 +285 @@
                 A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButtonPressed.png; path = macosx/Images/ActionButtonPressed.png; sourceTree = "<group>"; };
                 A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = "<group>"; };
-                A221DA870A8F7E7E0011E98E /* InfoTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InfoTableView.h; path = macosx/InfoTableView.h; sourceTree = "<group>"; };
-                A221DA880A8F7E7E0011E98E /* InfoTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = InfoTableView.m; path = macosx/InfoTableView.m; sourceTree = "<group>"; };
                 A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = macosx/Images/ProgressBarWhite.png; sourceTree = "<group>"; };
                 A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = macosx/Images/ProgressBarBlue.png; sourceTree = "<group>"; };
@@ -402 +399 @@
                                 A2710E740A86796000CE4F7D /* PrefsWindow.h */,
                                 A2710E750A86796000CE4F7D /* PrefsWindow.m */,
-                                A221DA870A8F7E7E0011E98E /* InfoTableView.h */,
-                                A221DA880A8F7E7E0011E98E /* InfoTableView.m */,
                         );
                         name = Sources;
@@ -818 +813 @@
                                 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */,
                                 A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */,
-                                A221DA8A0A8F7E7E0011E98E /* InfoTableView.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/English.lproj/InfoWindow.nib/classes.nib

@@ -5 +5 @@
             LANGUAGE = ObjC; 
             OUTLETS = {fContextMenu = NSMenu; }; 
-            SUPERCLASS = InfoTableView; 
+            SUPERCLASS = NSTableView; 
         }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = InfoTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
         {
             ACTIONS = {

trunk/macosx/FileTableView.h

@@ -24 +24 @@
 
 #import <Cocoa/Cocoa.h>
-#import "InfoTableView.h"
 
-@interface FileTableView : InfoTableView
+@interface FileTableView : NSTableView
 {
     IBOutlet NSMenu * fContextMenu;

trunk/macosx/FileTableView.m

@@ -27 +27 @@
 @implementation FileTableView
 
+- (void) mouseDown: (NSEvent *) event
+{
+    [[self window] makeKeyWindow];
+    [super mouseDown: event];
+}
+
 - (NSMenu *) menuForEvent: (NSEvent *) e
 {

trunk/macosx/Torrent.m

@@ -519 +519 @@
 {
     int totalPeers, i;
-    
     tr_peer_stat_t * peers = tr_torrentPeers(fHandle, & totalPeers);
+    
+    NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers];
     tr_peer_stat_t peer;
-    
-    NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers];
     NSString * client;
     for (i = 0; i < totalPeers; i++)
@@ -539 +538 @@
             [NSNumber numberWithBool: peer.isUploading], @"DL From", nil]];
     }
-    //NSLog(@"%d", tr_peerId(peer));
     
     tr_torrentPeersFree(peers, totalPeers);