diff --git a/cocoa/base/ResultWindow.m b/cocoa/base/ResultWindow.m index 883ab11f..c6fec9d2 100644 --- a/cocoa/base/ResultWindow.m +++ b/cocoa/base/ResultWindow.m @@ -50,16 +50,26 @@ http://www.hardcoded.net/licenses/hs_license @implementation ResultWindowBase - (void)awakeFromNib { + _displayDelta = NO; + _powerMode = NO; [self window]; preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"]; [self initResultColumns]; [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(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(jobInProgress:) name:JobInProgress object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsUpdated:) name:ResultsUpdatedNotification object:nil]; + [[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(resultsUpdated:) name:ResultsUpdatedNotification object:nil]; } - (void)dealloc @@ -177,14 +187,14 @@ http://www.hardcoded.net/licenses/hs_license - (void)updatePySelection { - NSArray *selection; + NSArray *selection; if (_powerMode) { - selection = [py selectedPowerMarkerNodePaths]; - } + selection = [py selectedPowerMarkerNodePaths]; + } else { - selection = [py selectedResultNodePaths]; - } - [matches selectNodePaths:selection]; + selection = [py selectedResultNodePaths]; + } + [matches selectNodePaths:selection]; } - (void)performPySelection:(NSArray *)aIndexPaths @@ -239,7 +249,7 @@ http://www.hardcoded.net/licenses/hs_license [matches setTag:0]; [matches expandItem:nil expandChildren:YES]; [self outlineView:matches didClickTableColumn:nil]; - [self updatePySelection]; + [self updatePySelection]; } - (IBAction)copyMarked:(id)sender @@ -565,7 +575,7 @@ http://www.hardcoded.net/licenses/hs_license - (void)resultsUpdated:(NSNotification *)aNotification { - [matches invalidateBuffers]; + [matches invalidateBuffers]; [matches invalidateMarkings]; } diff --git a/cocoa/me/ResultWindow.m b/cocoa/me/ResultWindow.m index 37aa2aff..ffc7ae70 100644 --- a/cocoa/me/ResultWindow.m +++ b/cocoa/me/ResultWindow.m @@ -20,17 +20,8 @@ http://www.hardcoded.net/licenses/hs_license { [super awakeFromNib]; [[self window] setTitle:@"dupeGuru Music Edition"]; - _displayDelta = NO; - _powerMode = NO; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain]; [_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 */ diff --git a/cocoa/pe/ResultWindow.m b/cocoa/pe/ResultWindow.m index 17195d53..024e09f5 100644 --- a/cocoa/pe/ResultWindow.m +++ b/cocoa/pe/ResultWindow.m @@ -20,18 +20,9 @@ http://www.hardcoded.net/licenses/hs_license { [super awakeFromNib]; [[self window] setTitle:@"dupeGuru Picture Edition"]; - _displayDelta = NO; - _powerMode = NO; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)] retain]; [_deltaColumns removeIndex:3]; [_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 */ diff --git a/cocoa/se/ResultWindow.m b/cocoa/se/ResultWindow.m index 08f8bdac..0f4087f1 100644 --- a/cocoa/se/ResultWindow.m +++ b/cocoa/se/ResultWindow.m @@ -18,17 +18,8 @@ http://www.hardcoded.net/licenses/hs_license - (void)awakeFromNib { [super awakeFromNib]; - _displayDelta = NO; - _powerMode = NO; _deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,4)] retain]; [_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 */