Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

reset the message index when clearing the log

Browse Source
This commit is contained in:
Mitchell Livingston
2009-12-10 04:44:21 +00:00
parent 529dec7806
commit 3d30bb32d5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/MessageWindowController.h
View File

@@ -32,6 +32,7 @@
IBOutlet NSButton * fSaveButton, * fClearButton;
NSMutableArray * fMessages, * fDisplayedMessages;
NSUInteger fCurrentIndex;
NSDictionary * fAttributes;

7
macosx/MessageWindowController.m
View File

@@ -153,12 +153,10 @@
if ((messages = tr_getQueuedMessages()) == NULL)
return;
static NSUInteger currentIndex = 0;
[fLock lock];
NSScroller * scroller = [[fMessageTable enclosingScrollView] verticalScroller];
const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
const BOOL shouldScroll = fCurrentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
|| [scroller knobProportion] == 1.0;
const NSInteger maxLevel = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
@@ -175,7 +173,7 @@
NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithUTF8String: currentMessage->message], @"Message",
[NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
[NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
[NSNumber numberWithUnsignedInteger: fCurrentIndex++], @"Index", //more accurate when sorting by date
[NSNumber numberWithInteger: currentMessage->level], @"Level",
name, @"Name",
file, @"File", nil];
@@ -361,6 +359,7 @@
[fMessages removeAllObjects];
[fDisplayedMessages removeAllObjects];
[fMessageTable reloadData];
fCurrentIndex = 0;
[fLock unlock];
}

2
macosx/NSStringAdditions.m
View File

@@ -153,7 +153,7 @@
return [timeArray componentsJoinedByString: @" "];
}
//also used in InfoWindow.xib
//also used in InfoWindow.xib and MessageWindow.xib
- (NSComparisonResult) compareFinder: (NSString *) string
{
if ([NSApp isOnSnowLeopardOrBetter])