Brought back delta values.

core/app_cocoa.py

@@ -46,7 +46,6 @@ class DupeGuru(app.DupeGuru):
         appdata = op.join(appsupport, appdata_subdir)
         app.DupeGuru.__init__(self, data_module, appdata, appid)
         self.progress = cocoa.ThreadedJobPerformer()
-        self.display_delta_values = False
     
     #--- Override
     @staticmethod
@@ -156,9 +155,3 @@ class DupeGuru(app.DupeGuru):
         dupes = [self.results.dupes[row] for row in rows if row in xrange(len(self.results.dupes))]
         self._select_dupes(dupes)
     
-    def sort_dupes(self,key,asc):
-        self.results.sort_dupes(key,asc,self.display_delta_values)
-    
-    def sort_groups(self,key,asc):
-        self.results.sort_groups(key,asc)
-    

core/app_cocoa_inter.py

@@ -131,9 +131,6 @@ class PyDupeGuruBase(PyRegistrable):
     def setMixFileKind_(self, mix_file_kind):
         self.py.scanner.mix_file_kind = mix_file_kind
     
-    def setDisplayDeltaValues_(self, display_delta_values):
-        self.py.display_delta_values= display_delta_values
-    
     def setEscapeFilterRegexp_(self, escape_filter_regexp):
         self.py.options['escape_filter_regexp'] = escape_filter_regexp
     
@@ -175,10 +172,22 @@ class PyDirectoryOutline(PyOutline):
 class PyResultOutline(PyOutline):
     py_class = ResultTree
     
+    @signature('c@:')
+    def powerMarkerMode(self):
+        return self.py.power_marker
+    
     @signature('v@:c')
     def setPowerMarkerMode_(self, value):
         self.py.power_marker = value
     
+    @signature('c@:')
+    def deltaValuesMode(self):
+        return self.py.delta_values
+    
+    @signature('v@:c')
+    def setDeltaValuesMode_(self, value):
+        self.py.delta_values = value
+    
     @signature('@@:@i')
     def valueForPath_column_(self, path, column):
         return self.py.get_node_value(path, column)

core/gui/result_tree.py

@@ -34,6 +34,7 @@ class ResultTree(GUIObject, Tree):
         GUIObject.__init__(self, view, app)
         Tree.__init__(self)
         self._power_marker = False
+        self._delta_values = False
         self.connect()
         self._refresh()
         self.view.refresh()
@@ -60,16 +61,16 @@ class ResultTree(GUIObject, Tree):
             node = self.get_node(path)
         except IndexError:
             return '---'
-        if self.app.display_delta_values:
+        if self.delta_values:
             return node.data_delta[column]
         else:
             return node.data[column]
     
     def sort(self, key, asc):
         if self.power_marker:
-            self.app.sort_dupes(key, asc)
+            self.app.results.sort_dupes(key, asc, self.delta_values)
         else:
-            self.app.sort_groups(key, asc)
+            self.app.results.sort_groups(key, asc)
     
     @property
     def power_marker(self):
@@ -83,6 +84,18 @@ class ResultTree(GUIObject, Tree):
         self._refresh()
         self.view.refresh()
     
+    @property
+    def delta_values(self):
+        return self._delta_values
+    
+    @delta_values.setter
+    def delta_values(self, value):
+        if value == self._delta_values:
+            return
+        self._delta_values = value
+        self._refresh()
+        self.view.refresh()
+    
     @Tree.selected.setter
     def selected(self, node):
         self._selected = node