Fixed sorting.

cocoa/base/PyDupeGuru.h

@@ -40,9 +40,6 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)makeSelectedReference;
 - (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)deleteMarked;
 - (void)removeMarked;
@@ -50,7 +47,6 @@ http://www.hardcoded.net/licenses/hs_license
 //Data
 - (NSNumber *)getIgnoreListCount;
 - (NSNumber *)getMarkCount;
-- (NSString *)getStatLine;
 - (NSNumber *)getOperationalErrorCount;
 
 //Scanning options

core/app_cocoa_inter.py

@@ -108,13 +108,6 @@ class PyDupeGuruBase(PyRegistrable):
     def revealSelected(self):
         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
     def getIgnoreListCount(self):
         return len(self.py.scanner.ignore_list)
@@ -122,9 +115,6 @@ class PyDupeGuruBase(PyRegistrable):
     def getMarkCount(self):
         return self.py.results.mark_count
     
-    def getStatLine(self):
-        return self.py.stat_line
-    
     def getOperationalErrorCount(self):
         return self.py.last_op_error_count
     
@@ -197,6 +187,7 @@ class PyResultOutline(PyOutline):
     def renameSelected_(self, newname):
         return self.py.app.RenameSelected(newname)
     
+    @signature('v@:ic')
     def sortBy_ascending_(self, key, asc):
         self.py.sort(key, asc)
     

core/gui/result_tree.py

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

core/gui/stats_label.py

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