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

Fixed delta columns.

Browse Source
This commit is contained in:
Virgil Dupras 2011-11-27 12:54:58 -05:00
parent 7e95404903
commit 0571151c5f
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocoa/base/ResultTable.h
View File

@ -14,7 +14,7 @@ http://www.hardcoded.net/licenses/bsd_license
@interface ResultTable : HSTable <QLPreviewPanelDataSource, QLPreviewPanelDelegate> @interface ResultTable : HSTable <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
{ {
NSIndexSet *_deltaColumns; NSSet *_deltaColumns;
HSColumns *columns; HSColumns *columns;
} }
- (id)initWithPy:(id)aPy view:(NSTableView *)aTableView; - (id)initWithPy:(id)aPy view:(NSTableView *)aTableView;
@ -24,7 +24,7 @@ http://www.hardcoded.net/licenses/bsd_license
- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode; - (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
- (BOOL)deltaValuesMode; - (BOOL)deltaValuesMode;
- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode; - (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns; - (void)setDeltaColumns:(NSSet *)aDeltaColumns;
- (NSInteger)selectedDupeCount; - (NSInteger)selectedDupeCount;
- (void)removeSelected; - (void)removeSelected;
@end; @end;

5
cocoa/base/ResultTable.m
View File

@ -85,7 +85,7 @@ http://www.hardcoded.net/licenses/bsd_license
[[self py] setDeltaValuesMode:aDeltaValuesMode]; [[self py] setDeltaValuesMode:aDeltaValuesMode];
} }
- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns - (void)setDeltaColumns:(NSSet *)aDeltaColumns
{ {
[_deltaColumns release]; [_deltaColumns release];
_deltaColumns = [aDeltaColumns retain]; _deltaColumns = [aDeltaColumns retain];
@ -165,8 +165,7 @@ http://www.hardcoded.net/licenses/bsd_license
} }
else if (isMarkable) { else if (isMarkable) {
if ([self deltaValuesMode]) { if ([self deltaValuesMode]) {
NSInteger i = [[column identifier] integerValue]; if ([_deltaColumns containsObject:[column identifier]]) {
if ([_deltaColumns containsIndex:i]) {
color = [NSColor orangeColor]; color = [NSColor orangeColor];
} }
} }

2
cocoa/base/ResultWindow.m
View File

@ -31,7 +31,7 @@ http://www.hardcoded.net/licenses/bsd_license
[self fillColumnsMenu]; [self fillColumnsMenu];
[matches setTarget:self]; [matches setTarget:self];
[matches setDoubleAction:@selector(openClicked:)]; [matches setDoubleAction:@selector(openClicked:)];
[table setDeltaColumns:[Utils array2IndexSet:[py deltaColumns]]]; [table setDeltaColumns:[NSSet setWithArray:[py deltaColumns]]];
[[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];

2
core/tests/base.py
View File

@ -43,7 +43,7 @@ class DupeGuru(DupeGuruBase):
Column('size', 'Size (KB)'), Column('size', 'Size (KB)'),
Column('extension', 'Kind'), Column('extension', 'Kind'),
] ]
DELTA_COLUMNS = {2,} DELTA_COLUMNS = {'size', }
METADATA_TO_READ = ['size'] METADATA_TO_READ = ['size']
def __init__(self): def __init__(self):

2
core_me/app.py
View File

@ -16,7 +16,7 @@ from .result_table import ResultTable
class DupeGuru(DupeGuruBase): class DupeGuru(DupeGuruBase):
NAME = __appname__ NAME = __appname__
DELTA_COLUMNS = {2, 3, 4, 5, 7} DELTA_COLUMNS = {'size', 'duration', 'bitrate', 'samplerate', 'mtime'}
METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist', METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
'album', 'genre', 'year', 'track', 'comment'] 'album', 'genre', 'year', 'track', 'comment']

2
core_pe/app.py
View File

@ -24,7 +24,7 @@ def get_delta_dimensions(value, ref_value):
class DupeGuru(DupeGuruBase): class DupeGuru(DupeGuruBase):
NAME = __appname__ NAME = __appname__
DELTA_COLUMNS = {2, 4, 5} DELTA_COLUMNS = {'size', 'dimensions', 'mtime'}
METADATA_TO_READ = ['size', 'mtime', 'dimensions'] METADATA_TO_READ = ['size', 'mtime', 'dimensions']
def __init__(self, view, appdata): def __init__(self, view, appdata):

2
core_se/app.py
View File

@ -15,7 +15,7 @@ from .result_table import ResultTable
class DupeGuru(DupeGuruBase): class DupeGuru(DupeGuruBase):
NAME = __appname__ NAME = __appname__
DELTA_COLUMNS = {2, 4} DELTA_COLUMNS = {'size', 'mtime'}
METADATA_TO_READ = ['size', 'mtime'] METADATA_TO_READ = ['size', 'mtime']
def __init__(self, view, appdata): def __init__(self, view, appdata):