Changeset 7013


Ignore:
Timestamp:
Nov 1, 2008, 10:08:02 PM (12 years ago)
Author:
livings124
Message:

trivial changes

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Transmission.xcodeproj/project.pbxproj

    r7005 r7013  
    3838                4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; };
    3939                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 */; };
    4141                4D4C8BD00E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; };
    4242                4D4C8BD10E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; };
     
    4747                4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; };
    4848                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 */; };
    5050                4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; };
    5151                4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; };
     
    263263                BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3640C72A0EF00DBEFE0 /* select.c */; };
    264264                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 */; };
    266266                BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
    267267                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 */; };
    269269                BEFC1D050C07825A00B0BB3C /* remote.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C140C07756200B0BB3C /* remote.c */; };
    270270                BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
     
    398398                4D118E1908CB46B20033958F /* PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsController.m; path = macosx/PrefsController.m; sourceTree = "<group>"; };
    399399                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>"; };
    401401                4D2784360905709500687951 /* Transmission.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = Transmission.icns; path = macosx/Images/Transmission.icns; sourceTree = "<group>"; };
    402402                4D364D9E091FBB2C00377D12 /* TorrentTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentTableView.h; path = macosx/TorrentTableView.h; sourceTree = "<group>"; };
     
    793793                        files = (
    794794                                4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */,
    795                                 4D9A2BF909E16D4F002D0FF9 /* libcrypto.0.9.7.dylib in Frameworks */,
     795                                4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */,
    796796                                A22E59A70DC11A1D00F4BE15 /* libcurl.dylib in Frameworks */,
    797797                                A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */,
     
    808808                                A2C0C2E00E00CCE400D95339 /* Security.framework in Frameworks */,
    809809                                4D1838DD09DEC0E80047D688 /* libtransmission.a in Frameworks */,
    810                                 4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */,
     810                                4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */,
    811811                                A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */,
    812812                                A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */,
     
    844844                        buildActionMask = 2147483647;
    845845                        files = (
    846                                 BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */,
     846                                BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */,
    847847                                BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */,
    848848                                A22E59A80DC11A1F00F4BE15 /* libcurl.dylib in Frameworks */,
     
    856856                        buildActionMask = 2147483647;
    857857                        files = (
    858                                 BEFC1CF40C07822400B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */,
     858                                BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */,
    859859                                BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */,
    860860                                A22E59A90DC11A2000F4BE15 /* libcurl.dylib in Frameworks */,
     
    12131213                        isa = PBXGroup;
    12141214                        children = (
    1215                                 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */,
     1215                                4D2617F709DECE3D00D08EFA /* libcrypto.dylib */,
    12161216                                A29EBE700DC06068006CEE80 /* libcurl.dylib */,
    12171217                                4D4C8BCF0E93DB720004ACB8 /* libz.dylib */,
  • trunk/macosx/AddWindowController.h

    r6974 r7013  
    2525#import <Cocoa/Cocoa.h>
    2626#import "Torrent.h"
    27 #import "FileOutlineController.h"
    2827
     28@class FileOutlineController;
    2929@class Controller;
    3030
  • trunk/macosx/AddWindowController.m

    r6974 r7013  
    2424
    2525#import "AddWindowController.h"
     26#import "FileOutlineController.h"
    2627#import "Controller.h"
    2728#import "GroupsController.h"
     
    3132#import "ExpandedPathToIconTransformer.h"
    3233
    33 #define UPDATE_SECONDS 1.0f
     34#define UPDATE_SECONDS 1.0
    3435
    3536@interface AddWindowController (Private)
  • trunk/macosx/Controller.h

    r6736 r7013  
    3131#import "DragOverlayWindow.h"
    3232#import "Badger.h"
    33 #import "StatusBarView.h"
    34 #import "FilterButton.h"
    35 #import "MenuLabel.h"
    3633
    3734#import <Growl/Growl.h>
    3835
    3936@class TorrentTableView;
     37@class StatusBarView;
     38@class FilterButton;
     39@class MenuLabel;
    4040
    4141typedef enum
  • trunk/macosx/Controller.m

    r6980 r7013  
    4141#import "ToolbarSegmentedCell.h"
    4242#import "BlocklistDownloader.h"
     43#import "StatusBarView.h"
     44#import "FilterButton.h"
     45#import "MenuLabel.h"
    4346#import "NSApplicationAdditions.h"
    4447#import "NSStringAdditions.h"
  • trunk/macosx/CreatorWindowController.m

    r7008 r7013  
    2626#import "NSApplicationAdditions.h"
    2727#import "NSStringAdditions.h"
    28 #include "utils.h" //tr_httpIsValidURL
     28#import "utils.h" //tr_httpIsValidURL
    2929
    3030#define TRACKER_ADD_TAG 0
  • trunk/macosx/DragOverlayView.m

    r4423 r7013  
    2626#import "NSBezierPathAdditions.h"
    2727
    28 #define PADDING 10.0
    29 #define ICON_WIDTH 64.0
     28#define PADDING 10.0f
     29#define ICON_WIDTH 64.0f
    3030
    3131@implementation DragOverlayView
     
    3636    {
    3737        //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];
    4040       
    4141        fBackBadge = [[NSImage alloc] initWithSize: badgeRect.size];
    4242        [fBackBadge lockFocus];
    4343       
    44         [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set];
     44        [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.75f] set];
    4545        [bp fill];
    4646       
     
    4949        //create attributes
    5050        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];
    5353       
    5454        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];
    5757       
    5858        NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
     
    9595   
    9696    //place icon
    97     [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect
    98             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];
    9999   
    100100    //place main text
     
    102102    NSSize subLineSize = [subLine sizeWithAttributes: fSubLineAttributes];
    103103   
    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);
    107107    [mainLine drawInRect: lineRect withAttributes: fMainLineAttributes];
    108108   
    109109    //place sub text
    110     lineRect.origin.y -= subLineSize.height + 2.0;
     110    lineRect.origin.y -= subLineSize.height + 2.0f;
    111111    lineRect.size.height = subLineSize.height;
    112112    [subLine drawInRect: lineRect withAttributes: fSubLineAttributes];
     
    123123        NSRect frame = [self frame];
    124124        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];
    127127    }
    128128}
  • trunk/macosx/DragOverlayWindow.m

    r6958 r7013  
    3737        fLib = lib;
    3838       
    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];
    4141        [self setOpaque: NO];
    4242        [self setHasShadow: NO];
     
    7777{
    7878    uint64_t size = 0;
    79     int count = 0;
     79    NSInteger count = 0;
    8080   
    8181    NSString * name;
    8282    BOOL folder;
    83     int fileCount = 0;
     83    NSInteger fileCount = 0;
    8484   
    8585    NSString * file;
    8686    NSEnumerator * enumerator = [files objectEnumerator];
    87     tr_ctor * ctor;
    88     tr_info info;
    8987    while ((file = [enumerator nextObject]))
    9088    {
    9189        if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
    9290        {
    93             ctor = tr_ctorNew(fLib);
     91            tr_ctor * ctor = tr_ctorNew(fLib);
    9492            tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
     93            tr_info info;
    9594            if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
    9695            {
     
    174173        [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
    175174    }
    176     if ([self alphaValue] > 0.0)
     175    if ([self alphaValue] > 0.0f)
    177176        [fFadeOutAnimation startAnimation];
    178177}
Note: See TracChangeset for help on using the changeset viewer.