diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 398b6b7d5..88e597d7f 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -81,7 +81,6 @@ A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A21610FB0A050B1700E8E4C1 /* MenuButton.m */; }; 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 */; }; A2305A820A3DC9E400AB2D77 /* ProgressBarGray.png in Resources */ = {isa = PBXBuildFile; fileRef = A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */; }; @@ -285,8 +284,6 @@ A21610FB0A050B1700E8E4C1 /* MenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MenuButton.m; path = macosx/MenuButton.m; sourceTree = ""; }; A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButtonPressed.png; path = macosx/Images/ActionButtonPressed.png; sourceTree = ""; }; A21DFF0F0A292B2B007C5F76 /* Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Transfers.png; path = macosx/Images/Transfers.png; sourceTree = ""; }; - A221DA870A8F7E7E0011E98E /* InfoTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InfoTableView.h; path = macosx/InfoTableView.h; sourceTree = ""; }; - A221DA880A8F7E7E0011E98E /* InfoTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = InfoTableView.m; path = macosx/InfoTableView.m; sourceTree = ""; }; A2305A7C0A3DC9E400AB2D77 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = macosx/Images/ProgressBarWhite.png; sourceTree = ""; }; A2305A7D0A3DC9E400AB2D77 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = macosx/Images/ProgressBarBlue.png; sourceTree = ""; }; A2305A7E0A3DC9E400AB2D77 /* ProgressBarGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGray.png; path = macosx/Images/ProgressBarGray.png; sourceTree = ""; }; @@ -401,8 +398,6 @@ A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */, A2710E740A86796000CE4F7D /* PrefsWindow.h */, A2710E750A86796000CE4F7D /* PrefsWindow.m */, - A221DA870A8F7E7E0011E98E /* InfoTableView.h */, - A221DA880A8F7E7E0011E98E /* InfoTableView.m */, ); name = Sources; sourceTree = ""; @@ -817,7 +812,6 @@ A27431DB0A68538400FA780A /* BarButton.m in Sources */, A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */, A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */, - A221DA8A0A8F7E7E0011E98E /* InfoTableView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/macosx/English.lproj/InfoWindow.nib/classes.nib b/macosx/English.lproj/InfoWindow.nib/classes.nib index 12bc4d761..4c9c9f5c5 100644 --- a/macosx/English.lproj/InfoWindow.nib/classes.nib +++ b/macosx/English.lproj/InfoWindow.nib/classes.nib @@ -4,10 +4,9 @@ CLASS = FileTableView; LANGUAGE = ObjC; OUTLETS = {fContextMenu = NSMenu; }; - SUPERCLASS = InfoTableView; + SUPERCLASS = NSTableView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = InfoTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, { ACTIONS = { revealFile = id; diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index a58a97c0d..bf95cca07 100644 Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ diff --git a/macosx/FileTableView.h b/macosx/FileTableView.h index 6d0a670ee..054a28dcb 100644 --- a/macosx/FileTableView.h +++ b/macosx/FileTableView.h @@ -23,9 +23,8 @@ *****************************************************************************/ #import -#import "InfoTableView.h" -@interface FileTableView : InfoTableView +@interface FileTableView : NSTableView { IBOutlet NSMenu * fContextMenu; } diff --git a/macosx/FileTableView.m b/macosx/FileTableView.m index db7540317..32f130c72 100644 --- a/macosx/FileTableView.m +++ b/macosx/FileTableView.m @@ -26,6 +26,12 @@ @implementation FileTableView +- (void) mouseDown: (NSEvent *) event +{ + [[self window] makeKeyWindow]; + [super mouseDown: event]; +} + - (NSMenu *) menuForEvent: (NSEvent *) e { int row = [self rowAtPoint: [self convertPoint: [e locationInWindow] fromView: nil]]; diff --git a/macosx/InfoTableView.h b/macosx/InfoTableView.h deleted file mode 100644 index c3bd93472..000000000 --- a/macosx/InfoTableView.h +++ /dev/null @@ -1,30 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Copyright (c) 2005-2006 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import - -@interface InfoTableView : NSTableView -{ -} -@end diff --git a/macosx/InfoTableView.m b/macosx/InfoTableView.m deleted file mode 100644 index 078e909a2..000000000 --- a/macosx/InfoTableView.m +++ /dev/null @@ -1,35 +0,0 @@ -/****************************************************************************** - * $Id$ - * - * Copyright (c) 2005-2006 Transmission authors and contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *****************************************************************************/ - -#import "InfoTableView.h" - -@implementation InfoTableView - -- (void) mouseDown: (NSEvent *) event -{ - [[self window] makeKeyWindow]; - [super mouseDown: event]; -} - -@end diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 42b825265..4aa2193c9 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -518,11 +518,10 @@ - (NSArray *) peers { int totalPeers, i; - tr_peer_stat_t * peers = tr_torrentPeers(fHandle, & totalPeers); - tr_peer_stat_t peer; NSMutableArray * peerDics = [NSMutableArray arrayWithCapacity: totalPeers]; + tr_peer_stat_t peer; NSString * client; for (i = 0; i < totalPeers; i++) { @@ -538,7 +537,6 @@ [NSNumber numberWithBool: peer.isDownloading], @"UL To", [NSNumber numberWithBool: peer.isUploading], @"DL From", nil]]; } - //NSLog(@"%d", tr_peerId(peer)); tr_torrentPeersFree(peers, totalPeers);