From afb9d97f55c6c6e9d2731f34e73341459e0deb7f Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sat, 1 Nov 2008 15:22:32 +0000 Subject: [PATCH] update NEWS; trivial changes --- NEWS | 1 + macosx/FileListNode.h | 2 +- macosx/FileListNode.m | 2 +- macosx/FileNameCell.m | 5 ++--- macosx/FilePriorityCell.m | 10 +++++----- macosx/InfoWindowController.h | 6 +++--- macosx/InfoWindowController.m | 3 +++ macosx/PiecesView.h | 3 ++- macosx/PiecesView.m | 1 + macosx/PrefsController.h | 3 ++- macosx/PrefsController.m | 1 + macosx/TorrentTableView.h | 2 +- 12 files changed, 23 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 5691d13d0..9519402ef 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ NEWS file for Transmission - All Platforms + Tracker communication uses fewer resources + + Bandwidth displays now include overhead data transfer + More accurate bandwidth management + Stability, security, and performance improvements to the RPC and Web UI server + Lazy bitfields (always on) diff --git a/macosx/FileListNode.h b/macosx/FileListNode.h index df341df92..0bad7f3ca 100644 --- a/macosx/FileListNode.h +++ b/macosx/FileListNode.h @@ -37,7 +37,7 @@ } - (id) initWithFolderName: (NSString *) name path: (NSString *) path; -- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (int) index; +- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index; - (void) insertChild: (FileListNode *) child; - (void) insertIndex: (NSUInteger) index withSize: (uint64_t) size; diff --git a/macosx/FileListNode.m b/macosx/FileListNode.m index 13ba9ec48..a75150669 100644 --- a/macosx/FileListNode.m +++ b/macosx/FileListNode.m @@ -43,7 +43,7 @@ return self; } -- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (int) index +- (id) initWithFileName: (NSString *) name path: (NSString *) path size: (uint64_t) size index: (NSUInteger) index { if ((self = [self initWithFolder: NO name: name path: path])) { diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m index 1a897d93b..a540ba61f 100644 --- a/macosx/FileNameCell.m +++ b/macosx/FileNameCell.m @@ -193,9 +193,8 @@ if (![(FileListNode *)[self objectValue] isFolder]) { - result = bounds; - result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE; - result.origin.y += result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height; + result.origin.x = bounds.origin.x + PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE; + result.origin.y = bounds.origin.y + result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height; } else { diff --git a/macosx/FilePriorityCell.m b/macosx/FilePriorityCell.m index 7191d86c5..de611279e 100644 --- a/macosx/FilePriorityCell.m +++ b/macosx/FilePriorityCell.m @@ -40,7 +40,7 @@ for (NSInteger i = 0; i < [self segmentCount]; i++) { [self setLabel: @"" forSegment: i]; - [self setWidth: 9.0 forSegment: i]; //9 is minimum size to get proper look + [self setWidth: 9.0f forSegment: i]; //9 is minimum size to get proper look } [self setImage: [NSImage imageNamed: @"PriorityControlLow.png"] forSegment: 0]; @@ -52,12 +52,12 @@ return self; } -- (void) setSelected: (BOOL) flag forSegment: (int) segment +- (void) setSelected: (BOOL) flag forSegment: (NSInteger) segment { [super setSelected: flag forSegment: segment]; //only for when clicking manually - int priority; + NSInteger priority; switch (segment) { case 0: @@ -137,8 +137,8 @@ } NSSize imageSize = [image size]; - [image compositeToPoint: NSMakePoint(cellFrame.origin.x + (cellFrame.size.width - imageSize.width) * 0.5, - cellFrame.origin.y + (cellFrame.size.height + imageSize.height) * 0.5) operation: NSCompositeSourceOver]; + [image compositeToPoint: NSMakePoint(cellFrame.origin.x + (cellFrame.size.width - imageSize.width) * 0.5f, + cellFrame.origin.y + (cellFrame.size.height + imageSize.height) * 0.5f) operation: NSCompositeSourceOver]; } } diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index bca93c9ed..19655b19e 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -23,12 +23,12 @@ *****************************************************************************/ #import -#import "Torrent.h" -#import "FileOutlineController.h" -#import "PiecesView.h" #import +@class Torrent; @class TrackerTableView; +@class FileOutlineController; +@class PiecesView; @interface InfoWindowController : NSWindowController { diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 3311bc48d..9c69ad12d 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -23,10 +23,13 @@ *****************************************************************************/ #import "InfoWindowController.h" +#import "Torrent.h" #import "InfoTabButtonCell.h" #import "FileOutlineView.h" +#import "FileOutlineController.h" #import "FileListNode.h" #import "TrackerTableView.h" +#import "PiecesView.h" #import "QuickLookController.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" diff --git a/macosx/PiecesView.h b/macosx/PiecesView.h index 26421ef57..b96391bbb 100644 --- a/macosx/PiecesView.h +++ b/macosx/PiecesView.h @@ -23,7 +23,8 @@ *****************************************************************************/ #import -#import "Torrent.h" + +@class Torrent; @interface PiecesView : NSImageView { diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m index 16d1dc858..29a75cb44 100644 --- a/macosx/PiecesView.m +++ b/macosx/PiecesView.m @@ -23,6 +23,7 @@ *****************************************************************************/ #import "PiecesView.h" +#import "Torrent.h" #import "InfoWindowController.h" #import "CTGradient.h" #import "utils.h" diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 5bcbf6f93..55b890f64 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -24,7 +24,8 @@ #import #import -#import "PortChecker.h" + +@class PortChecker; @interface PrefsController : NSWindowController { diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index b35e8bbfa..f479ce12f 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -25,6 +25,7 @@ #import "PrefsController.h" #import "BlocklistDownloaderViewController.h" #import "BlocklistScheduler.h" +#import "PortChecker.h" #import "NSApplicationAdditions.h" #import "NSStringAdditions.h" #import "UKKQueue.h" diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h index bdc447cfa..0d812a509 100644 --- a/macosx/TorrentTableView.h +++ b/macosx/TorrentTableView.h @@ -24,7 +24,7 @@ #import #import -#import +#import "Controller.h" @class TorrentCell;