diff --git a/pe/cocoa/ResultWindow.h b/pe/cocoa/ResultWindow.h index 5816d50a..8aa0f0bb 100644 --- a/pe/cocoa/ResultWindow.h +++ b/pe/cocoa/ResultWindow.h @@ -10,7 +10,6 @@ IBOutlet NSSearchField *filterField; IBOutlet NSSegmentedControl *pmSwitch; IBOutlet NSWindow *preferencesPanel; - IBOutlet NSTextField *stats; NSMutableArray *_resultColumns; NSMutableIndexSet *_deltaColumns; @@ -35,7 +34,6 @@ - (IBAction)revealSelected:(id)sender; - (IBAction)showPreferencesPanel:(id)sender; - (IBAction)startDuplicateScan:(id)sender; -- (IBAction)switchSelected:(id)sender; - (IBAction)toggleColumn:(id)sender; - (IBAction)toggleDelta:(id)sender; - (IBAction)toggleDetailsPanel:(id)sender; @@ -45,10 +43,6 @@ - (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn; - (NSArray *)getColumnsOrder; - (NSDictionary *)getColumnsWidth; -- (NSArray *)getSelected:(BOOL)aDupesOnly; -- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly; -- (void)performPySelection:(NSArray *)aIndexPaths; - (void)initResultColumns; -- (void)refreshStats; - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth; @end diff --git a/pe/cocoa/ResultWindow.m b/pe/cocoa/ResultWindow.m index d2e415bf..cfd93106 100644 --- a/pe/cocoa/ResultWindow.m +++ b/pe/cocoa/ResultWindow.m @@ -25,8 +25,6 @@ [self initResultColumns]; [self refreshStats]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil]; NSToolbar *t = [[[NSToolbar alloc] initWithIdentifier:@"ResultWindowToolbar"] autorelease]; [t setAllowsUserCustomization:YES]; @@ -229,13 +227,6 @@ } } -- (IBAction)switchSelected:(id)sender -{ - [self performPySelection:[self getSelectedPaths:YES]]; - [py makeSelectedReference]; - [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self]; -} - - (IBAction)toggleColumn:(id)sender { NSMenuItem *mi = sender; @@ -330,43 +321,6 @@ return result; } -- (NSArray *)getSelected:(BOOL)aDupesOnly -{ - if (_powerMode) - aDupesOnly = NO; - NSIndexSet *indexes = [matches selectedRowIndexes]; - NSMutableArray *nodeList = [NSMutableArray array]; - OVNode *node; - int i = [indexes firstIndex]; - while (i != NSNotFound) - { - node = [matches itemAtRow:i]; - if (!aDupesOnly || ([node level] > 1)) - [nodeList addObject:node]; - i = [indexes indexGreaterThanIndex:i]; - } - return nodeList; -} - -- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly -{ - NSMutableArray *r = [NSMutableArray array]; - NSArray *selected = [self getSelected:aDupesOnly]; - NSEnumerator *e = [selected objectEnumerator]; - OVNode *node; - while (node = [e nextObject]) - [r addObject:p2a([node indexPath])]; - return r; -} - -- (void)performPySelection:(NSArray *)aIndexPaths -{ - if (_powerMode) - [py selectPowerMarkerNodePaths:aIndexPaths]; - else - [py selectResultNodePaths:aIndexPaths]; -} - - (void)initResultColumns { NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"]; @@ -382,11 +336,6 @@ [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]]; } --(void)refreshStats -{ - [stats setStringValue:[py getStatLine]]; -} - - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth { NSTableColumn *col; @@ -448,14 +397,6 @@ [[NSNotificationCenter defaultCenter] postNotificationName:DuplicateSelectionChangedNotification object:self]; } -- (void)resultsChanged:(NSNotification *)aNotification -{ - [matches reloadData]; - [self expandAll:nil]; - [self outlineViewSelectionDidChange:nil]; - [self refreshStats]; -} - - (void)resultsMarkingChanged:(NSNotification *)aNotification { [matches invalidateMarkings];