arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-07-03 05:53:20 +00:00
Code Releases Wiki Activity

Eliminated code duplication in ResultsWindow's awakeFromNib.

Browse Source
This commit is contained in:
Virgil Dupras 2010-02-09 14:50:27 +01:00
parent d193eed519
commit 39f1cac2c8
4 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cocoa/base/ResultWindow.m
View File

@ -50,16 +50,26 @@ http://www.hardcoded.net/licenses/hs_license
@implementation ResultWindowBase @implementation ResultWindowBase
- (void)awakeFromNib - (void)awakeFromNib
{ {
_displayDelta = NO;
_powerMode = NO;
[self window]; [self window];
preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"]; preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
[self initResultColumns]; [self initResultColumns];
[self fillColumnsMenu]; [self fillColumnsMenu];
[deltaSwitch setSelectedSegment:0];
[pmSwitch setSelectedSegment:0];
[py setDisplayDeltaValues:b2n(_displayDelta)];
[matches setTarget:self];
[matches setDoubleAction:@selector(openSelected:)];
[self refreshStats];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil];
} }
- (void)dealloc - (void)dealloc
@ -177,14 +187,14 @@ http://www.hardcoded.net/licenses/hs_license
- (void)updatePySelection - (void)updatePySelection
{ {
NSArray *selection; NSArray *selection;
if (_powerMode) { if (_powerMode) {
selection = [py selectedPowerMarkerNodePaths]; selection = [py selectedPowerMarkerNodePaths];
} }
else { else {
selection = [py selectedResultNodePaths]; selection = [py selectedResultNodePaths];
} }
[matches selectNodePaths:selection]; [matches selectNodePaths:selection];
} }
- (void)performPySelection:(NSArray *)aIndexPaths - (void)performPySelection:(NSArray *)aIndexPaths
@ -239,7 +249,7 @@ http://www.hardcoded.net/licenses/hs_license
[matches setTag:0]; [matches setTag:0];
[matches expandItem:nil expandChildren:YES]; [matches expandItem:nil expandChildren:YES];
[self outlineView:matches didClickTableColumn:nil]; [self outlineView:matches didClickTableColumn:nil];
[self updatePySelection]; [self updatePySelection];
} }
- (IBAction)copyMarked:(id)sender - (IBAction)copyMarked:(id)sender
@ -565,7 +575,7 @@ http://www.hardcoded.net/licenses/hs_license
- (void)resultsUpdated:(NSNotification *)aNotification - (void)resultsUpdated:(NSNotification *)aNotification
{ {
[matches invalidateBuffers]; [matches invalidateBuffers];
[matches invalidateMarkings]; [matches invalidateMarkings];
} }

9
cocoa/me/ResultWindow.m
View File

@ -20,17 +20,8 @@ http://www.hardcoded.net/licenses/hs_license
{ {
[super awakeFromNib]; [super awakeFromNib];
[[self window] setTitle:@"dupeGuru Music Edition"]; [[self window] setTitle:@"dupeGuru Music Edition"];
_displayDelta = NO;
_powerMode = NO;
_deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain]; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
[_deltaColumns removeIndex:6]; [_deltaColumns removeIndex:6];
[deltaSwitch setSelectedSegment:0];
[pmSwitch setSelectedSegment:0];
[py setDisplayDeltaValues:b2n(_displayDelta)];
[matches setTarget:self];
[matches setDoubleAction:@selector(openSelected:)];
[self refreshStats];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
} }
/* Actions */ /* Actions */

9
cocoa/pe/ResultWindow.m
View File

@ -20,18 +20,9 @@ http://www.hardcoded.net/licenses/hs_license
{ {
[super awakeFromNib]; [super awakeFromNib];
[[self window] setTitle:@"dupeGuru Picture Edition"]; [[self window] setTitle:@"dupeGuru Picture Edition"];
_displayDelta = NO;
_powerMode = NO;
_deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain]; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain];
[_deltaColumns removeIndex:3]; [_deltaColumns removeIndex:3];
[_deltaColumns removeIndex:4]; [_deltaColumns removeIndex:4];
[deltaSwitch setSelectedSegment:0];
[pmSwitch setSelectedSegment:0];
[py setDisplayDeltaValues:b2n(_displayDelta)];
[matches setTarget:self];
[matches setDoubleAction:@selector(openSelected:)];
[self refreshStats];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
} }
/* Actions */ /* Actions */

9
cocoa/se/ResultWindow.m
View File

@ -18,17 +18,8 @@ http://www.hardcoded.net/licenses/hs_license
- (void)awakeFromNib - (void)awakeFromNib
{ {
[super awakeFromNib]; [super awakeFromNib];
_displayDelta = NO;
_powerMode = NO;
_deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain]; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain];
[_deltaColumns removeIndex:3]; [_deltaColumns removeIndex:3];
[deltaSwitch setSelectedSegment:0];
[pmSwitch setSelectedSegment:0];
[py setDisplayDeltaValues:b2n(_displayDelta)];
[matches setTarget:self];
[matches setDoubleAction:@selector(openSelected:)];
[self refreshStats];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
} }
/* Actions */ /* Actions */