Changeset 7013
- Timestamp:
- Nov 1, 2008, 10:08:02 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Transmission.xcodeproj/project.pbxproj
r7005 r7013 38 38 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; }; 39 39 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */ = {isa = PBXBuildFile; fileRef = A2D3078E0D9EC45F0051FD27 /* blocklist.c */; }; 40 4D4B7F6109E055660053C1EB /* libcrypto. 0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };40 4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 41 41 4D4C8BD00E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; }; 42 42 4D4C8BD10E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; }; … … 47 47 4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; }; 48 48 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; 49 4D9A2BF909E16D4F002D0FF9 /* libcrypto. 0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };49 4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 50 50 4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; }; 51 51 4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; }; … … 263 263 BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3640C72A0EF00DBEFE0 /* select.c */; }; 264 264 BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE75C3490C729E9500DBEFE0 /* libevent.a */; }; 265 BEFC1C040C07753100B0BB3C /* libcrypto. 0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };265 BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 266 266 BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; 267 267 BEFC1C1A0C07756200B0BB3C /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C0E0C07756200B0BB3C /* daemon.c */; }; 268 BEFC1CF40C07822400B0BB3C /* libcrypto. 0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };268 BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; }; 269 269 BEFC1D050C07825A00B0BB3C /* remote.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C140C07756200B0BB3C /* remote.c */; }; 270 270 BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; }; … … 398 398 4D118E1908CB46B20033958F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsController.m; path = macosx/PrefsController.m; sourceTree = "<group>"; }; 399 399 4D18389709DEC0030047D688 /* libtransmission.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtransmission.a; sourceTree = BUILT_PRODUCTS_DIR; }; 400 4D2617F709DECE3D00D08EFA /* libcrypto. 0.9.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.0.9.7.dylib; path = /usr/lib/libcrypto.0.9.7.dylib; sourceTree = "<absolute>"; };400 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; }; 401 401 4D2784360905709500687951 /* Transmission.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = Transmission.icns; path = macosx/Images/Transmission.icns; sourceTree = "<group>"; }; 402 402 4D364D9E091FBB2C00377D12 /* TorrentTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentTableView.h; path = macosx/TorrentTableView.h; sourceTree = "<group>"; }; … … 793 793 files = ( 794 794 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */, 795 4D9A2BF909E16D4F002D0FF9 /* libcrypto. 0.9.7.dylib in Frameworks */,795 4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */, 796 796 A22E59A70DC11A1D00F4BE15 /* libcurl.dylib in Frameworks */, 797 797 A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */, … … 808 808 A2C0C2E00E00CCE400D95339 /* Security.framework in Frameworks */, 809 809 4D1838DD09DEC0E80047D688 /* libtransmission.a in Frameworks */, 810 4D4B7F6109E055660053C1EB /* libcrypto. 0.9.7.dylib in Frameworks */,810 4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */, 811 811 A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */, 812 812 A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */, … … 844 844 buildActionMask = 2147483647; 845 845 files = ( 846 BEFC1C040C07753100B0BB3C /* libcrypto. 0.9.7.dylib in Frameworks */,846 BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */, 847 847 BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */, 848 848 A22E59A80DC11A1F00F4BE15 /* libcurl.dylib in Frameworks */, … … 856 856 buildActionMask = 2147483647; 857 857 files = ( 858 BEFC1CF40C07822400B0BB3C /* libcrypto. 0.9.7.dylib in Frameworks */,858 BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */, 859 859 BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */, 860 860 A22E59A90DC11A2000F4BE15 /* libcurl.dylib in Frameworks */, … … 1213 1213 isa = PBXGroup; 1214 1214 children = ( 1215 4D2617F709DECE3D00D08EFA /* libcrypto. 0.9.7.dylib */,1215 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */, 1216 1216 A29EBE700DC06068006CEE80 /* libcurl.dylib */, 1217 1217 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */, -
trunk/macosx/AddWindowController.h
r6974 r7013 25 25 #import <Cocoa/Cocoa.h> 26 26 #import "Torrent.h" 27 #import "FileOutlineController.h"28 27 28 @class FileOutlineController; 29 29 @class Controller; 30 30 -
trunk/macosx/AddWindowController.m
r6974 r7013 24 24 25 25 #import "AddWindowController.h" 26 #import "FileOutlineController.h" 26 27 #import "Controller.h" 27 28 #import "GroupsController.h" … … 31 32 #import "ExpandedPathToIconTransformer.h" 32 33 33 #define UPDATE_SECONDS 1.0 f34 #define UPDATE_SECONDS 1.0 34 35 35 36 @interface AddWindowController (Private) -
trunk/macosx/Controller.h
r6736 r7013 31 31 #import "DragOverlayWindow.h" 32 32 #import "Badger.h" 33 #import "StatusBarView.h"34 #import "FilterButton.h"35 #import "MenuLabel.h"36 33 37 34 #import <Growl/Growl.h> 38 35 39 36 @class TorrentTableView; 37 @class StatusBarView; 38 @class FilterButton; 39 @class MenuLabel; 40 40 41 41 typedef enum -
trunk/macosx/Controller.m
r6980 r7013 41 41 #import "ToolbarSegmentedCell.h" 42 42 #import "BlocklistDownloader.h" 43 #import "StatusBarView.h" 44 #import "FilterButton.h" 45 #import "MenuLabel.h" 43 46 #import "NSApplicationAdditions.h" 44 47 #import "NSStringAdditions.h" -
trunk/macosx/CreatorWindowController.m
r7008 r7013 26 26 #import "NSApplicationAdditions.h" 27 27 #import "NSStringAdditions.h" 28 #i nclude"utils.h" //tr_httpIsValidURL28 #import "utils.h" //tr_httpIsValidURL 29 29 30 30 #define TRACKER_ADD_TAG 0 -
trunk/macosx/DragOverlayView.m
r4423 r7013 26 26 #import "NSBezierPathAdditions.h" 27 27 28 #define PADDING 10.0 29 #define ICON_WIDTH 64.0 28 #define PADDING 10.0f 29 #define ICON_WIDTH 64.0f 30 30 31 31 @implementation DragOverlayView … … 36 36 { 37 37 //create badge 38 NSRect badgeRect = NSMakeRect(0 , 0, 325.0, 84.0);39 NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0 ];38 NSRect badgeRect = NSMakeRect(0.0f, 0.0f, 325.0f, 84.0f); 39 NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0f]; 40 40 41 41 fBackBadge = [[NSImage alloc] initWithSize: badgeRect.size]; 42 42 [fBackBadge lockFocus]; 43 43 44 [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set];44 [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.75f] set]; 45 45 [bp fill]; 46 46 … … 49 49 //create attributes 50 50 NSShadow * stringShadow = [[NSShadow alloc] init]; 51 [stringShadow setShadowOffset: NSMakeSize(2.0 , -2.0)];52 [stringShadow setShadowBlurRadius: 4.0 ];51 [stringShadow setShadowOffset: NSMakeSize(2.0f, -2.0f)]; 52 [stringShadow setShadowBlurRadius: 4.0f]; 53 53 54 54 NSFont * bigFont = [[NSFontManager sharedFontManager] convertFont: 55 [NSFont fontWithName: @"Lucida Grande" size: 18.0 ] toHaveTrait: NSBoldFontMask],56 * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0 ];55 [NSFont fontWithName: @"Lucida Grande" size: 18.0f] toHaveTrait: NSBoldFontMask], 56 * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0f]; 57 57 58 58 NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; … … 95 95 96 96 //place icon 97 [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5 , ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect98 operation: NSCompositeSourceOver fraction: 1.0 ];97 [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5f, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect 98 operation: NSCompositeSourceOver fraction: 1.0f]; 99 99 100 100 //place main text … … 102 102 NSSize subLineSize = [subLine sizeWithAttributes: fSubLineAttributes]; 103 103 104 NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0 ,105 (badgeSize.height + (subLineSize.height + 2.0 - mainLineSize.height)) * 0.5,106 badgeSize.width - (PADDING + ICON_WIDTH + 2.0 ) - PADDING, mainLineSize.height);104 NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0f, 105 (badgeSize.height + (subLineSize.height + 2.0f - mainLineSize.height)) * 0.5f, 106 badgeSize.width - (PADDING + ICON_WIDTH + 2.0f) - PADDING, mainLineSize.height); 107 107 [mainLine drawInRect: lineRect withAttributes: fMainLineAttributes]; 108 108 109 109 //place sub text 110 lineRect.origin.y -= subLineSize.height + 2.0 ;110 lineRect.origin.y -= subLineSize.height + 2.0f; 111 111 lineRect.size.height = subLineSize.height; 112 112 [subLine drawInRect: lineRect withAttributes: fSubLineAttributes]; … … 123 123 NSRect frame = [self frame]; 124 124 NSSize imageSize = [fBadge size]; 125 [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5 ,126 (frame.size.height - imageSize.height) * 0.5 ) operation: NSCompositeSourceOver];125 [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5f, 126 (frame.size.height - imageSize.height) * 0.5f) operation: NSCompositeSourceOver]; 127 127 } 128 128 } -
trunk/macosx/DragOverlayWindow.m
r6958 r7013 37 37 fLib = lib; 38 38 39 [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.5]];40 [self setAlphaValue: 0.0 ];39 [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.5f]]; 40 [self setAlphaValue: 0.0f]; 41 41 [self setOpaque: NO]; 42 42 [self setHasShadow: NO]; … … 77 77 { 78 78 uint64_t size = 0; 79 intcount = 0;79 NSInteger count = 0; 80 80 81 81 NSString * name; 82 82 BOOL folder; 83 intfileCount = 0;83 NSInteger fileCount = 0; 84 84 85 85 NSString * file; 86 86 NSEnumerator * enumerator = [files objectEnumerator]; 87 tr_ctor * ctor;88 tr_info info;89 87 while ((file = [enumerator nextObject])) 90 88 { 91 89 if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame) 92 90 { 93 ctor = tr_ctorNew(fLib);91 tr_ctor * ctor = tr_ctorNew(fLib); 94 92 tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]); 93 tr_info info; 95 94 if (tr_torrentParse(fLib, ctor, &info) == TR_OK) 96 95 { … … 174 173 [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]]; 175 174 } 176 if ([self alphaValue] > 0.0 )175 if ([self alphaValue] > 0.0f) 177 176 [fFadeOutAnimation startAnimation]; 178 177 }
Note: See TracChangeset
for help on using the changeset viewer.