Changeset 7013

Timestamp:

Nov 1, 2008, 10:08:02 PM (12 years ago)

Author:

livings124

Message:

trivial changes

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (9 diffs)
• macosx/AddWindowController.h (modified) (1 diff)
• macosx/AddWindowController.m (modified) (2 diffs)
• macosx/Controller.h (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)
• macosx/CreatorWindowController.m (modified) (1 diff)
• macosx/DragOverlayView.m (modified) (6 diffs)
• macosx/DragOverlayWindow.m (modified) (3 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -38 +38 @@
                 4D3EA0AA08AE13C600EA10C2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3EA0A908AE13C600EA10C2 /* IOKit.framework */; };
                 4D4ADFC70DA1631500A68297 /* blocklist.c in Sources */ = {isa = PBXBuildFile; fileRef = A2D3078E0D9EC45F0051FD27 /* blocklist.c */; };
-                4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };
+                4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; };
                 4D4C8BD00E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; };
                 4D4C8BD10E93DB720004ACB8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */; };
@@ -47 +47 @@
                 4D752E930913C949008EAAD4 /* Preferences.png in Resources */ = {isa = PBXBuildFile; fileRef = 4D752E920913C949008EAAD4 /* Preferences.png */; };
                 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
-                4D9A2BF909E16D4F002D0FF9 /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };
+                4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; };
                 4DA6FDBA0911233800450CB1 /* PauseOn.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB80911233800450CB1 /* PauseOn.png */; };
                 4DA6FDBB0911233800450CB1 /* PauseOff.png in Resources */ = {isa = PBXBuildFile; fileRef = 4DA6FDB90911233800450CB1 /* PauseOff.png */; };
@@ -263 +263 @@
                 BE75C3710C72A0EF00DBEFE0 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = BE75C3640C72A0EF00DBEFE0 /* select.c */; };
                 BE75C38A0C72A1ED00DBEFE0 /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE75C3490C729E9500DBEFE0 /* libevent.a */; };
-                BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };
+                BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; };
                 BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
                 BEFC1C1A0C07756200B0BB3C /* daemon.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C0E0C07756200B0BB3C /* daemon.c */; };
-                BEFC1CF40C07822400B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */; };
+                BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D2617F709DECE3D00D08EFA /* libcrypto.dylib */; };
                 BEFC1D050C07825A00B0BB3C /* remote.c in Sources */ = {isa = PBXBuildFile; fileRef = BEFC1C140C07756200B0BB3C /* remote.c */; };
                 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>"; };
                 4D18389709DEC0030047D688 /* libtransmission.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtransmission.a; sourceTree = BUILT_PRODUCTS_DIR; };
-                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>"; };
+                4D2617F709DECE3D00D08EFA /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
                 4D2784360905709500687951 /* Transmission.icns */ = {isa = PBXFileReference; explicitFileType = image.icns; name = Transmission.icns; path = macosx/Images/Transmission.icns; sourceTree = "<group>"; };
                 4D364D9E091FBB2C00377D12 /* TorrentTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentTableView.h; path = macosx/TorrentTableView.h; sourceTree = "<group>"; };
@@ -793 +793 @@
                         files = (
                                 4D9A2BF009E16D21002D0FF9 /* libtransmission.a in Frameworks */,
-                                4D9A2BF909E16D4F002D0FF9 /* libcrypto.0.9.7.dylib in Frameworks */,
+                                4D9A2BF909E16D4F002D0FF9 /* libcrypto.dylib in Frameworks */,
                                 A22E59A70DC11A1D00F4BE15 /* libcurl.dylib in Frameworks */,
                                 A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */,
@@ -808 +808 @@
                                 A2C0C2E00E00CCE400D95339 /* Security.framework in Frameworks */,
                                 4D1838DD09DEC0E80047D688 /* libtransmission.a in Frameworks */,
-                                4D4B7F6109E055660053C1EB /* libcrypto.0.9.7.dylib in Frameworks */,
+                                4D4B7F6109E055660053C1EB /* libcrypto.dylib in Frameworks */,
                                 A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */,
                                 A261F1DC0A69A1610002815A /* Growl.framework in Frameworks */,
@@ -844 +844 @@
                         buildActionMask = 2147483647;
                         files = (
-                                BEFC1C040C07753100B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */,
+                                BEFC1C040C07753100B0BB3C /* libcrypto.dylib in Frameworks */,
                                 BEFC1C050C07753500B0BB3C /* libtransmission.a in Frameworks */,
                                 A22E59A80DC11A1F00F4BE15 /* libcurl.dylib in Frameworks */,
@@ -856 +856 @@
                         buildActionMask = 2147483647;
                         files = (
-                                BEFC1CF40C07822400B0BB3C /* libcrypto.0.9.7.dylib in Frameworks */,
+                                BEFC1CF40C07822400B0BB3C /* libcrypto.dylib in Frameworks */,
                                 BEFC1D2D0C0783D900B0BB3C /* libtransmission.a in Frameworks */,
                                 A22E59A90DC11A2000F4BE15 /* libcurl.dylib in Frameworks */,
@@ -1213 +1213 @@
                         isa = PBXGroup;
                         children = (
-                                4D2617F709DECE3D00D08EFA /* libcrypto.0.9.7.dylib */,
+                                4D2617F709DECE3D00D08EFA /* libcrypto.dylib */,
                                 A29EBE700DC06068006CEE80 /* libcurl.dylib */,
                                 4D4C8BCF0E93DB720004ACB8 /* libz.dylib */,

trunk/macosx/AddWindowController.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 #import "Torrent.h"
-#import "FileOutlineController.h"
 
+@class FileOutlineController;
 @class Controller;
 

trunk/macosx/AddWindowController.m

@@ -24 +24 @@
 
 #import "AddWindowController.h"
+#import "FileOutlineController.h"
 #import "Controller.h"
 #import "GroupsController.h"
@@ -31 +32 @@
 #import "ExpandedPathToIconTransformer.h"
 
-#define UPDATE_SECONDS 1.0f
+#define UPDATE_SECONDS 1.0
 
 @interface AddWindowController (Private)

trunk/macosx/Controller.h

@@ -31 +31 @@
 #import "DragOverlayWindow.h"
 #import "Badger.h"
-#import "StatusBarView.h"
-#import "FilterButton.h"
-#import "MenuLabel.h"
 
 #import <Growl/Growl.h>
 
 @class TorrentTableView;
+@class StatusBarView;
+@class FilterButton;
+@class MenuLabel;
 
 typedef enum

trunk/macosx/Controller.m

@@ -41 +41 @@
 #import "ToolbarSegmentedCell.h"
 #import "BlocklistDownloader.h"
+#import "StatusBarView.h"
+#import "FilterButton.h"
+#import "MenuLabel.h"
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"

trunk/macosx/CreatorWindowController.m

@@ -26 +26 @@
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#include "utils.h" //tr_httpIsValidURL
+#import "utils.h" //tr_httpIsValidURL
 
 #define TRACKER_ADD_TAG 0

trunk/macosx/DragOverlayView.m

@@ -26 +26 @@
 #import "NSBezierPathAdditions.h"
 
-#define PADDING 10.0
-#define ICON_WIDTH 64.0
+#define PADDING 10.0f
+#define ICON_WIDTH 64.0f
 
 @implementation DragOverlayView
@@ -36 +36 @@
     {
         //create badge
-        NSRect badgeRect = NSMakeRect(0, 0, 325.0, 84.0);
-        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0];
+        NSRect badgeRect = NSMakeRect(0.0f, 0.0f, 325.0f, 84.0f);
+        NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: badgeRect radius: 15.0f];
         
         fBackBadge = [[NSImage alloc] initWithSize: badgeRect.size];
         [fBackBadge lockFocus];
         
-        [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.75] set];
+        [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.75f] set];
         [bp fill];
         
@@ -49 +49 @@
         //create attributes
         NSShadow * stringShadow = [[NSShadow alloc] init];
-        [stringShadow setShadowOffset: NSMakeSize(2.0, -2.0)];
-        [stringShadow setShadowBlurRadius: 4.0];
+        [stringShadow setShadowOffset: NSMakeSize(2.0f, -2.0f)];
+        [stringShadow setShadowBlurRadius: 4.0f];
         
         NSFont * bigFont = [[NSFontManager sharedFontManager] convertFont:
-                                [NSFont fontWithName: @"Lucida Grande" size: 18.0] toHaveTrait: NSBoldFontMask],
-                * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0];
+                                [NSFont fontWithName: @"Lucida Grande" size: 18.0f] toHaveTrait: NSBoldFontMask],
+                * smallFont = [NSFont fontWithName: @"Lucida Grande" size: 14.0f];
         
         NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
@@ -95 +95 @@
     
     //place icon
-    [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect
-            operation: NSCompositeSourceOver fraction: 1.0];
+    [icon drawInRect: NSMakeRect(PADDING, (badgeSize.height - ICON_WIDTH) * 0.5f, ICON_WIDTH, ICON_WIDTH) fromRect: NSZeroRect
+            operation: NSCompositeSourceOver fraction: 1.0f];
     
     //place main text
@@ -102 +102 @@
     NSSize subLineSize = [subLine sizeWithAttributes: fSubLineAttributes];
     
-    NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0,
-                        (badgeSize.height + (subLineSize.height + 2.0 - mainLineSize.height)) * 0.5,
-                        badgeSize.width - (PADDING + ICON_WIDTH + 2.0) - PADDING, mainLineSize.height);
+    NSRect lineRect = NSMakeRect(PADDING + ICON_WIDTH + 5.0f,
+                        (badgeSize.height + (subLineSize.height + 2.0f - mainLineSize.height)) * 0.5f,
+                        badgeSize.width - (PADDING + ICON_WIDTH + 2.0f) - PADDING, mainLineSize.height);
     [mainLine drawInRect: lineRect withAttributes: fMainLineAttributes];
     
     //place sub text
-    lineRect.origin.y -= subLineSize.height + 2.0;
+    lineRect.origin.y -= subLineSize.height + 2.0f;
     lineRect.size.height = subLineSize.height;
     [subLine drawInRect: lineRect withAttributes: fSubLineAttributes];
@@ -123 +123 @@
         NSRect frame = [self frame];
         NSSize imageSize = [fBadge size];
-        [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5,
-                    (frame.size.height - imageSize.height) * 0.5) operation: NSCompositeSourceOver];
+        [fBadge compositeToPoint: NSMakePoint((frame.size.width - imageSize.width) * 0.5f,
+                    (frame.size.height - imageSize.height) * 0.5f) operation: NSCompositeSourceOver];
     }
 }

trunk/macosx/DragOverlayWindow.m

@@ -37 +37 @@
         fLib = lib;
         
-        [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0 alpha: 0.5]];
-        [self setAlphaValue: 0.0];
+        [self setBackgroundColor: [NSColor colorWithCalibratedWhite: 0.0f alpha: 0.5f]];
+        [self setAlphaValue: 0.0f];
         [self setOpaque: NO];
         [self setHasShadow: NO];
@@ -77 +77 @@
 {
     uint64_t size = 0;
-    int count = 0;
+    NSInteger count = 0;
     
     NSString * name;
     BOOL folder;
-    int fileCount = 0;
+    NSInteger fileCount = 0;
     
     NSString * file;
     NSEnumerator * enumerator = [files objectEnumerator];
-    tr_ctor * ctor;
-    tr_info info;
     while ((file = [enumerator nextObject]))
     {
         if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
         {
-            ctor = tr_ctorNew(fLib);
+            tr_ctor * ctor = tr_ctorNew(fLib);
             tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
+            tr_info info;
             if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
             {
@@ -174 +173 @@
         [fFadeOutAnimation setCurrentProgress: 1.0 - [fFadeInAnimation currentProgress]];
     }
-    if ([self alphaValue] > 0.0)
+    if ([self alphaValue] > 0.0f)
         [fFadeOutAnimation startAnimation];
 }