me v6.1.1

.hgtags

@@ -56,3 +56,5 @@ e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
 925847384dcef62a5c3518fc9e5ce42feab2b093 pe2.2.2
 383b14d6e8555ed2c8d5552259bc7ce600dfb1d0 before-leopard-drop
 a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
+5a5134a4fa9bb7ca80ae3e32010030f5bd7ba434 me6.1.0
+0fd77be57ff716d5c93232e829dc02acec036d7c se3.2.1

core/gui/problem_dialog.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2010-04-12
 # Copyright 2011 Hardcoded Software (http://www.hardcoded.net)
@@ -19,7 +18,7 @@ class ProblemDialog(GUIObject, Broadcaster):
     
     def reveal_selected_dupe(self):
         if self._selected_dupe is not None:
-            self.app._reveal_path(self._selected_dupe.path)
+            self.app.view.reveal_path(self._selected_dupe.path)
     
     def select_dupe(self, dupe):
         self._selected_dupe = dupe

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.1.0'
+__version__ = '6.1.1'
 __appname__ = 'dupeGuru Music Edition'

core_se/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.2.0'
+__version__ = '3.2.1'
 __appname__ = 'dupeGuru'

help/changelog_me

@@ -1,3 +1,7 @@
+=== 6.1.1 (2011-10-03)
+
+* Fixed a couple of broken action bindings from v6.1.0.
+
 === 6.1.0 (2011-09-29)
 
 * Added duplicate re-prioritization dialog. (#138)

help/changelog_se

@@ -1,3 +1,7 @@
+=== 3.2.1 (2011-10-02)
+
+* Fixed a couple of broken action bindings from v3.2.0.
+
 === 3.2.0 (2011-09-27)
 
 * Added duplicate re-prioritization dialog. (#138)

qt/base/app.py

@@ -148,7 +148,7 @@ class DupeGuru(QObject):
         if not destination:
             return
         recreate_path = self.prefs.destination_type
-        self.model.copy_or_move_marked(self, copy, destination, recreate_path)
+        self.model.copy_or_move_marked(copy, destination, recreate_path)
     
     def remove_selected(self):
         dupes = self.model.without_ref(self.model.selected_dupes)

qt/base/result_window.py

@@ -250,7 +250,7 @@ class ResultWindow(QMainWindow):
             QMessageBox.information(self, title, trmsg("IgnoreListClearedMsg"))
     
     def copyTriggered(self):
-        self.app.model.copy_or_move_marked(True)
+        self.app.copy_or_move_marked(True)
     
     def deleteTriggered(self):
         count = self.app.model.results.mark_count
@@ -302,7 +302,7 @@ class ResultWindow(QMainWindow):
         self.app.model.toggle_selected_mark_state()
     
     def moveTriggered(self):
-        self.app.model.copy_or_move_marked(False)
+        self.app.copy_or_move_marked(False)
     
     def openTriggered(self):
         self.app.model.open_selected()