Changeset 771 for trunk/macosx

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/macosx

Files:

• English.lproj/InfoWindow.nib/classes.nib (modified) (1 diff)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• FileTableView.h (modified) (1 diff)
• FileTableView.m (modified) (1 diff)
• InfoTableView.h (deleted)
• InfoTableView.m (deleted)
• Torrent.m (modified) (2 diffs)

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);