From 7297f8232cc1c60ee357c1db31b5ce3a7f9aa206 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 3 Sep 2006 17:06:43 +0000 Subject: [PATCH] Display a warning when in debug mode. --- .../MessageWindow.nib/classes.nib | 2 ++ .../MessageWindow.nib/keyedobjects.nib | Bin 7784 -> 9211 bytes macosx/InfoWindowController.m | 2 +- macosx/MessageWindowController.h | 3 +++ macosx/MessageWindowController.m | 21 +++++++++++++++--- macosx/Torrent.m | 8 +++---- macosx/TorrentCell.m | 8 ++++++- 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/macosx/English.lproj/MessageWindow.nib/classes.nib b/macosx/English.lproj/MessageWindow.nib/classes.nib index cd2b7772d..b517634be 100644 --- a/macosx/English.lproj/MessageWindow.nib/classes.nib +++ b/macosx/English.lproj/MessageWindow.nib/classes.nib @@ -6,6 +6,8 @@ CLASS = MessageWindowController; LANGUAGE = ObjC; OUTLETS = { + fDebugWarningField = NSTextField; + fDebugWarningIcon = NSImageView; fLevelButton = NSPopUpButton; fScrollView = NSScrollView; fTextView = NSTextView; diff --git a/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib b/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib index a0b5e65cb16c6ab906d03f6db5d67529a2663950..1db4bbada97923c6e0807d10e211659919000de2 100644 GIT binary patch literal 9211 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 F{{XPE2NVDR delta 5375 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 diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 0cece2f82..f6943e0ae 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -63,7 +63,7 @@ fCheckImage = [NSImage imageNamed: @"NSMenuCheckmark"]; fTorrents = [[NSArray alloc] init]; - fPeers = [[NSMutableArray alloc] initWithCapacity: 6]; + fPeers = [[NSMutableArray alloc] initWithCapacity: 30]; fFiles = [[NSMutableArray alloc] initWithCapacity: 6]; [fFileTable setDoubleAction: @selector(revealFile:)]; diff --git a/macosx/MessageWindowController.h b/macosx/MessageWindowController.h index 465ea1cc4..3fb578ef1 100644 --- a/macosx/MessageWindowController.h +++ b/macosx/MessageWindowController.h @@ -35,6 +35,9 @@ NSDictionary * fAttributes; int fLines; + + IBOutlet NSTextField * fDebugWarningField; + IBOutlet NSImageView * fDebugWarningIcon; } - (void) updateLog: (NSTimer *) timer; diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m index 898423463..56c0edebd 100644 --- a/macosx/MessageWindowController.m +++ b/macosx/MessageWindowController.m @@ -29,9 +29,15 @@ #define LEVEL_INFO 1 #define LEVEL_DEBUG 2 -#define UPDATE_SECONDS 0.35 +#define UPDATE_SECONDS 0.4 #define MAX_LINES 1000 +@interface MessageWindowController (Private) + +- (void) setDebugWarningHidden: (BOOL) hide; + +@end + @implementation MessageWindowController - (id) initWithWindowNibName: (NSString *) name @@ -80,6 +86,8 @@ [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"]; } + [self setDebugWarningHidden: level != TR_MSG_DBG]; + tr_setMessageLevel(level); tr_setMessageQueuing(1); } @@ -115,8 +123,7 @@ //remove the first line if at max number of lines if (fLines == MAX_LINES) { - NSString * text = [fTextView string]; - unsigned int loc = [text rangeOfString: @"\n"].location; + unsigned int loc = [[fTextView string] rangeOfString: @"\n"].location; if (loc != NSNotFound) [[fTextView textStorage] deleteCharactersInRange: NSMakeRange(0, loc + 1)]; } @@ -145,6 +152,8 @@ else level = TR_MSG_ERR; + [self setDebugWarningHidden: level != TR_MSG_DBG]; + tr_setMessageLevel(level); [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"]; } @@ -187,4 +196,10 @@ [string release]; } +- (void) setDebugWarningHidden: (BOOL) hide +{ + [fDebugWarningField setHidden: hide]; + [fDebugWarningIcon setHidden: hide]; +} + @end diff --git a/macosx/Torrent.m b/macosx/Torrent.m index 20a9d9af7..208af37e2 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -436,8 +436,7 @@ - (NSString *) torrentLocationString { - return fPrivateTorrent ? @"Transmission Support Folder" - : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath]; + return fPrivateTorrent ? @"Transmission Support Folder" : [fPublicTorrentLocation stringByAbbreviatingWithTildeInPath]; } - (NSString *) dataLocation @@ -530,7 +529,6 @@ for (i = 0; i < totalPeers; i++) { peer = peers[i]; - [peerDics addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool: peer.isConnected], @"Connected", [NSString stringWithCString: (char *) peer.addr encoding: NSUTF8StringEncoding], @"IP", @@ -640,8 +638,8 @@ for (i = 0; i < count; i++) { file = fInfo->files[i]; - [files addObject: [NSDictionary dictionaryWithObjectsAndKeys: [[self downloadFolder] - stringByAppendingPathComponent: [NSString stringWithUTF8String: file.name]], @"Name", + [files addObject: [NSDictionary dictionaryWithObjectsAndKeys: + [[self downloadFolder] stringByAppendingPathComponent: [NSString stringWithUTF8String: file.name]], @"Name", [NSNumber numberWithUnsignedLongLong: file.length], @"Size", nil]]; } diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index b78171c88..0a82f9809 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -90,12 +90,18 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80 fProgressEndGreen = [NSImage imageNamed: @"ProgressBarEndGreen.png"]; fProgressEndAdvanced = [NSImage imageNamed: @"ProgressBarEndAdvanced.png"]; - fErrorImage = [NSImage imageNamed: @"Error.tiff"]; + fErrorImage = [[NSImage imageNamed: @"Error.tiff"] copy]; [fErrorImage setFlipped: YES]; } return self; } +- (void) dealloc +{ + [fErrorImage release]; + [super dealloc]; +} + - (void) setTorrent: (Torrent *) torrent { fTorrent = torrent;