mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Larger default message window, font matching default Console look, and show date (in same format as Console).

This commit is contained in:
Mitchell Livingston 2006-08-22 01:59:46 +00:00
parent 6d15738403
commit 60ac9748a1
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/English.lproj/MessageWindow.nib/info.nib generated
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>69 64 356 240 0 0 1152 842 </string> <string>25 72 356 240 0 0 1152 842 </string>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>446.1</string> <string>446.1</string>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>

BIN
macosx/English.lproj/MessageWindow.nib/keyedobjects.nib generated
View File

Binary file not shown.

13
macosx/MessageWindowController.m
View File

@ -98,7 +98,7 @@ void addMessage(int level, const char * message)
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
NSString * levelString; NSString * levelString;
if (level == TR_MSG_ERR) if (level == TR_MSG_ERR)
levelString = @"ERR"; levelString = @"ERR";
else if (level == TR_MSG_INF) else if (level == TR_MSG_INF)
@ -109,7 +109,8 @@ void addMessage(int level, const char * message)
levelString = @"???"; levelString = @"???";
NSAttributedString * messageString = [[[NSAttributedString alloc] initWithString: NSAttributedString * messageString = [[[NSAttributedString alloc] initWithString:
[NSString stringWithFormat: @"%@: %s\n", levelString, message]] autorelease]; [NSString stringWithFormat: @"(%@ %@) %s\n", [[NSDate date] dateWithCalendarFormat: @"%Y-%m-%d %H:%M:%S.%F"
timeZone: nil], levelString, message]] autorelease];
[fLock lock]; [fLock lock];
[fBufferArray addObject: messageString]; [fBufferArray addObject: messageString];
@ -123,24 +124,26 @@ void addMessage(int level, const char * message)
if ([fBufferArray count] == 0) if ([fBufferArray count] == 0)
return; return;
[fLock lock];
//keep scrolled to bottom if already at bottom or there is no scroll bar yet //keep scrolled to bottom if already at bottom or there is no scroll bar yet
BOOL shouldScroll = NO; BOOL shouldScroll = NO;
NSScroller * scroller = [fScrollView verticalScroller]; NSScroller * scroller = [fScrollView verticalScroller];
if ([scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0) if ([scroller floatValue] == 1.0 || [scroller isHidden] || [scroller knobProportion] == 1.0)
shouldScroll = YES; shouldScroll = YES;
[fLock lock];
NSEnumerator * enumerator = [fBufferArray objectEnumerator]; NSEnumerator * enumerator = [fBufferArray objectEnumerator];
NSAttributedString * messageString; NSAttributedString * messageString;
while ((messageString = [enumerator nextObject])) while ((messageString = [enumerator nextObject]))
[[fTextView textStorage] appendAttributedString: messageString]; [[fTextView textStorage] appendAttributedString: messageString];
[fBufferArray removeAllObjects]; [fBufferArray removeAllObjects];
[fLock unlock]; [fTextView setFont: [NSFont fontWithName: @"Monaco" size: 10]]; //find a way to set this permanently
if (shouldScroll) if (shouldScroll)
[fTextView scrollRangeToVisible: NSMakeRange([[fTextView string] length], 0)]; [fTextView scrollRangeToVisible: NSMakeRange([[fTextView string] length], 0)];
[fLock unlock];
} }
- (void) changeLevel: (id) sender - (void) changeLevel: (id) sender