arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-09-11 17:58:17 +00:00
Code Releases Wiki Activity

Fixed sorting.

Browse Source
This commit is contained in:
Virgil Dupras 2010-02-11 21:03:22 +01:00
parent bab891ee74
commit d5f145d57e
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocoa/base/PyDupeGuru.h
View File

@ -40,9 +40,6 @@ http://www.hardcoded.net/licenses/hs_license
- (void)makeSelectedReference; - (void)makeSelectedReference;
- (void)applyFilter:(NSString *)filter; - (void)applyFilter:(NSString *)filter;
- (void)sortGroupsBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
- (void)sortDupesBy:(NSNumber *)aIdentifier ascending:(NSNumber *)aAscending;
- (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType; - (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
- (void)deleteMarked; - (void)deleteMarked;
- (void)removeMarked; - (void)removeMarked;
@ -50,7 +47,6 @@ http://www.hardcoded.net/licenses/hs_license
//Data //Data
- (NSNumber *)getIgnoreListCount; - (NSNumber *)getIgnoreListCount;
- (NSNumber *)getMarkCount; - (NSNumber *)getMarkCount;
- (NSString *)getStatLine;
- (NSNumber *)getOperationalErrorCount; - (NSNumber *)getOperationalErrorCount;
//Scanning options //Scanning options

11
core/app_cocoa_inter.py
View File

@ -108,13 +108,6 @@ class PyDupeGuruBase(PyRegistrable):
def revealSelected(self): def revealSelected(self):
self.py.reveal_selected() self.py.reveal_selected()
#---Misc
def sortDupesBy_ascending_(self, key, asc):
self.py.sort_dupes(key, asc)
def sortGroupsBy_ascending_(self, key, asc):
self.py.sort_groups(key, asc)
#---Information #---Information
def getIgnoreListCount(self): def getIgnoreListCount(self):
return len(self.py.scanner.ignore_list) return len(self.py.scanner.ignore_list)
@ -122,9 +115,6 @@ class PyDupeGuruBase(PyRegistrable):
def getMarkCount(self): def getMarkCount(self):
return self.py.results.mark_count return self.py.results.mark_count
def getStatLine(self):
return self.py.stat_line
def getOperationalErrorCount(self): def getOperationalErrorCount(self):
return self.py.last_op_error_count return self.py.last_op_error_count
@ -197,6 +187,7 @@ class PyResultOutline(PyOutline):
def renameSelected_(self, newname): def renameSelected_(self, newname):
return self.py.app.RenameSelected(newname) return self.py.app.RenameSelected(newname)
@signature('v@:ic')
def sortBy_ascending_(self, key, asc): def sortBy_ascending_(self, key, asc):
self.py.sort(key, asc) self.py.sort(key, asc)

6
core/gui/result_tree.py
View File

@ -35,6 +35,7 @@ class ResultTree(GUIObject, Tree):
Tree.__init__(self) Tree.__init__(self)
self._power_marker = False self._power_marker = False
self._delta_values = False self._delta_values = False
self._sort_descriptors = (0, True)
self.connect() self.connect()
self._refresh() self._refresh()
self.view.refresh() self.view.refresh()
@ -71,6 +72,9 @@ class ResultTree(GUIObject, Tree):
self.app.results.sort_dupes(key, asc, self.delta_values) self.app.results.sort_dupes(key, asc, self.delta_values)
else: else:
self.app.results.sort_groups(key, asc) self.app.results.sort_groups(key, asc)
self._sort_descriptors = (key, asc)
self._refresh()
self.view.refresh()
@property @property
def power_marker(self): def power_marker(self):
@ -81,6 +85,8 @@ class ResultTree(GUIObject, Tree):
if value == self._power_marker: if value == self._power_marker:
return return
self._power_marker = value self._power_marker = value
key, asc = self._sort_descriptors
self.sort(key, asc)
self._refresh() self._refresh()
self.view.refresh() self.view.refresh()

2
core/gui/stats_label.py
View File

@ -17,7 +17,7 @@ class StatsLabel(GUIObject):
@property @property
def display(self): def display(self):
return self.app.results.stat_line return self.app.stat_line
def results_changed(self): def results_changed(self):
self.view.refresh() self.view.refresh()