arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 14:41:39 +00:00
Code Releases Wiki Activity

Brought back delta values.

Browse Source
This commit is contained in:
Virgil Dupras
2010-02-11 19:22:31 +01:00
parent 46836cc805
commit a65fd7d0d0
11 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cocoa/base/PyDupeGuru.h
View File

@@ -56,7 +56,6 @@ http://www.hardcoded.net/licenses/hs_license
//Scanning options
- (void)setMinMatchPercentage:(NSNumber *)percentage;
- (void)setMixFileKind:(NSNumber *)mix_file_kind;
- (void)setDisplayDeltaValues:(NSNumber *)display_delta_values;
- (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
- (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
- (void)setSizeThreshold:(NSInteger)size_threshold;

3
cocoa/base/PyResultTree.h
View File

@@ -10,7 +10,10 @@ http://www.hardcoded.net/licenses/hs_license
#import "PyOutline.h"
@interface PyResultTree : PyOutline
- (BOOL)powerMarkerMode;
- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
- (BOOL)deltaValuesMode;
- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
- (BOOL)renameSelected:(NSString *)aNewName;

6
cocoa/base/ResultOutline.h
View File

@@ -12,10 +12,14 @@ http://www.hardcoded.net/licenses/hs_license
@interface ResultOutline : HSOutline
{
NSMutableIndexSet *_deltaColumns;
NSIndexSet *_deltaColumns;
}
- (PyResultTree *)py;
- (BOOL)powerMarkerMode;
- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
- (BOOL)deltaValuesMode;
- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns;
- (IBAction)markSelected:(id)sender;
@end;

39
cocoa/base/ResultOutline.m
View File

@@ -18,6 +18,12 @@ http://www.hardcoded.net/licenses/hs_license
return self;
}
- (void)dealloc
{
[_deltaColumns release];
[super dealloc];
}
- (PyResultTree *)py
{
return (PyResultTree *)py;
@@ -31,11 +37,32 @@ http://www.hardcoded.net/licenses/hs_license
}
/* Public */
- (BOOL)powerMarkerMode
{
return [[self py] powerMarkerMode];
}
- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
{
[[self py] setPowerMarkerMode:aPowerMarkerMode];
}
- (BOOL)deltaValuesMode
{
return [[self py] deltaValuesMode];
}
- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
{
[[self py] setDeltaValuesMode:aDeltaValuesMode];
}
- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
{
[_deltaColumns release];
_deltaColumns = [aDeltaColumns retain];
}
- (IBAction)markSelected:(id)sender
{
[[self py] markSelected];
@@ -96,12 +123,12 @@ http://www.hardcoded.net/licenses/hs_license
else {
[textCell setTextColor:[NSColor blueColor]];
}
// if ((_displayDelta) && (_powerMode || ([node level] > 1))) {
// NSInteger i = [[tableColumn identifier] integerValue];
// if ([_deltaColumns containsIndex:i]) {
// [textCell setTextColor:[NSColor orangeColor]];
// }
// }
if (([self deltaValuesMode]) && ([self powerMarkerMode] || ([path length] > 1))) {
NSInteger i = [[tableColumn identifier] integerValue];
if ([_deltaColumns containsIndex:i]) {
[textCell setTextColor:[NSColor orangeColor]];
}
}
}
}
@end

3
cocoa/base/ResultWindow.h
View File

@@ -27,10 +27,7 @@ http://www.hardcoded.net/licenses/hs_license
IBOutlet NSMenu *columnsMenu;
IBOutlet NSSearchField *filterField;
BOOL _powerMode;
BOOL _displayDelta;
NSMutableArray *_resultColumns;
NSMutableIndexSet *_deltaColumns;
NSWindowController *preferencesPanel;
ResultOutline *outline;
}

14
cocoa/base/ResultWindow.m
View File

@@ -33,8 +33,6 @@ http://www.hardcoded.net/licenses/hs_license
@implementation ResultWindowBase
- (void)awakeFromNib
{
_displayDelta = NO;
_powerMode = NO;
[self window];
preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
@@ -42,7 +40,6 @@ http://www.hardcoded.net/licenses/hs_license
[self fillColumnsMenu];
[deltaSwitch setSelectedSegment:0];
[pmSwitch setSelectedSegment:0];
[py setDisplayDeltaValues:b2n(_displayDelta)];
[matches setTarget:self];
[matches setDoubleAction:@selector(openClicked:)];
[self refreshStats];
@@ -116,7 +113,7 @@ http://www.hardcoded.net/licenses/hs_license
- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly
{
if (_powerMode)
if ([outline powerMarkerMode])
aDupesOnly = NO;
NSIndexSet *indexes = [matches selectedRowIndexes];
NSMutableArray *nodeList = [NSMutableArray array];
@@ -171,7 +168,7 @@ http://www.hardcoded.net/licenses/hs_license
- (void)performPySelection:(NSArray *)aIndexPaths
{
if (_powerMode) {
if ([outline powerMarkerMode]) {
[py selectPowerMarkerNodePaths:aIndexPaths];
}
else {
@@ -203,15 +200,12 @@ http://www.hardcoded.net/licenses/hs_license
- (IBAction)changeDelta:(id)sender
{
_displayDelta = [deltaSwitch selectedSegment] == 1;
[py setDisplayDeltaValues:b2n(_displayDelta)];
[self reloadMatches];
[outline setDeltaValuesMode:[deltaSwitch selectedSegment] == 1];
}
- (IBAction)changePowerMarker:(id)sender
{
_powerMode = [pmSwitch selectedSegment] == 1;
[outline setPowerMarkerMode:_powerMode];
[outline setPowerMarkerMode:[pmSwitch selectedSegment] == 1];
// [self outlineView:matches didClickTableColumn:nil];
}

5
cocoa/me/ResultWindow.h
View File

@@ -10,10 +10,7 @@ http://www.hardcoded.net/licenses/hs_license
#import "../base/ResultWindow.h"
#import "DirectoryPanel.h"
@interface ResultWindow : ResultWindowBase
{
NSString *_lastAction;
}
@interface ResultWindow : ResultWindowBase {}
- (IBAction)removeDeadTracks:(id)sender;
- (IBAction)startDuplicateScan:(id)sender;
@end

5
cocoa/me/ResultWindow.m
View File

@@ -20,8 +20,9 @@ http://www.hardcoded.net/licenses/hs_license
{
[super awakeFromNib];
[[self window] setTitle:@"dupeGuru Music Edition"];
_deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
[_deltaColumns removeIndex:6];
NSMutableIndexSet *deltaColumns = [[NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)] retain];
[deltaColumns removeIndex:6];
[outline setDeltaColumns:deltaColumns];
}
/* Actions */