Fixed the Qt-marked-column-deletion hack on ME, it was performed on SE columns instead.

.hgignore

@@ -15,6 +15,7 @@ install
 installer_tmp-cache
 cocoa/*/Info.plist
 cocoa/*/build
+cocoa/*/*.app
 cocoa/*/dg_cocoa.plugin
 cocoa/*/fr.lproj/*.xib
 cocoa/*/de.lproj/*.xib

.hgtags

@@ -60,3 +60,5 @@ a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
 0fd77be57ff716d5c93232e829dc02acec036d7c se3.2.1
 3dd08060135b0b9cef70b6f5a81f191ea339c8d5 me6.1.1
 4e6cbef6bcdfcc0e56ff9690fbfe1cac1f4b1b09 pe2.3.0
+9ea9af1b886cd1adc4f42fd2276cc2b38376eab0 se3.3.0
+6e3379be6821bb36d7f0877a17dd6c07aa037b0a se3.3.1

README

@@ -29,7 +29,7 @@ General dependencies
 - Python 3.2 (http://www.python.org)
 - Send2Trash3k (http://hg.hardcoded.net/send2trash)
 - hsaudiotag3k 1.1.0 (for ME) (http://hg.hardcoded.net/hsaudiotag)
-- jobprogress 1.0.2 (http://hg.hardcoded.net/jobprogress)
+- jobprogress 1.0.3 (http://hg.hardcoded.net/jobprogress)
 - Sphinx 1.1 (http://sphinx.pocoo.org/)
 - polib 0.7.0 (http://bitbucket.org/izi/polib)
 - pytest 2.0.0, to run unit tests. (http://pytest.org/)

build.py

@@ -78,12 +78,11 @@ def build_cocoa(edition, dev):
     os.system('xcodebuild {0}'.format(args))
     os.chdir('../..')
     print("Creating the run.py file")
-    subfolder = 'dev' if dev else 'release'
     app_path = {
-        'se': 'cocoa/se/build/{0}/dupeGuru.app',
-        'me': 'cocoa/me/build/{0}/dupeGuru\\ ME.app',
-        'pe': 'cocoa/pe/build/{0}/dupeGuru\\ PE.app',
-    }[edition].format(subfolder)
+        'se': 'cocoa/se/dupeGuru.app',
+        'me': 'cocoa/me/dupeGuru\\ ME.app',
+        'pe': 'cocoa/pe/dupeGuru\\ PE.app',
+    }[edition]
     tmpl = open('run_template_cocoa.py', 'rt').read()
     run_contents = tmpl.replace('{{app_path}}', app_path)
     open('run.py', 'wt').write(run_contents)

cocoa/me/InfoTemplate.plist

@@ -22,6 +22,8 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{version}</string>
 	<key>CFBundleVersion</key>
 	<string>{version}</string>
 	<key>NSMainNibFile</key>

cocoa/me/ResultWindow.m

@@ -56,15 +56,15 @@ http://www.hardcoded.net/licenses/bsd_license
         {@"dupe_count", 80, 16, 0, YES, nil},
         nil
     };
-    [[self columns] initializeColumns:defs];
+    [[table columns] initializeColumns:defs];
     NSTableColumn *c = [matches tableColumnWithIdentifier:@"marked"];
     [[c dataCell] setButtonType:NSSwitchButton];
     [[c dataCell] setControlSize:NSSmallControlSize];
-    c = [[self tableView] tableColumnWithIdentifier:@"size"];
+    c = [matches tableColumnWithIdentifier:@"size"];
     [[c dataCell] setAlignment:NSRightTextAlignment];
-    c = [[self tableView] tableColumnWithIdentifier:@"duration"];
+    c = [matches tableColumnWithIdentifier:@"duration"];
     [[c dataCell] setAlignment:NSRightTextAlignment];
-    c = [[self tableView] tableColumnWithIdentifier:@"bitrate"];
+    c = [matches tableColumnWithIdentifier:@"bitrate"];
     [[c dataCell] setAlignment:NSRightTextAlignment];
     [[table columns] restoreColumns];
 }

cocoa/me/dupeguru.xcodeproj/project.pbxproj

@@ -42,6 +42,7 @@
 		CE1425890AFB718500BD5167 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE1425880AFB718500BD5167 /* Sparkle.framework */; };
 		CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */; };
+		CE2239A2148FFE6600B3DC99 /* HSColumns.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2239A1148FFE6600B3DC99 /* HSColumns.m */; };
 		CE2E87F9142BC90A00519A68 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2E87F8142BC90A00519A68 /* Quartz.framework */; };
 		CE2E87FD142BC92C00519A68 /* HSQuicklook.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2E87FC142BC92C00519A68 /* HSQuicklook.m */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -146,6 +147,9 @@
 		CE1425880AFB718500BD5167 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE1EAA0812DF3E81009BA949 /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
 		CE1EAA0912DF3E81009BA949 /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
+		CE22399E148FFE4F00B3DC99 /* PyColumns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyColumns.h; sourceTree = "<group>"; };
+		CE2239A0148FFE6600B3DC99 /* HSColumns.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSColumns.h; sourceTree = "<group>"; };
+		CE2239A1148FFE6600B3DC99 /* HSColumns.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSColumns.m; sourceTree = "<group>"; };
 		CE2B2B5A1406ABDA0038D15A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = ../base/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CE2E87F8142BC90A00519A68 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
 		CE2E87FB142BC92C00519A68 /* HSQuicklook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSQuicklook.h; path = ../../cocoalib/HSQuicklook.h; sourceTree = "<group>"; };
@@ -370,6 +374,8 @@
 		CE003CB211242D00004B0AA7 /* controllers */ = {
 			isa = PBXGroup;
 			children = (
+				CE2239A0148FFE6600B3DC99 /* HSColumns.h */,
+				CE2239A1148FFE6600B3DC99 /* HSColumns.m */,
 				CE003CB311242D00004B0AA7 /* HSGUIController.h */,
 				CE003CB411242D00004B0AA7 /* HSGUIController.m */,
 				CE003CB511242D00004B0AA7 /* HSOutline.h */,
@@ -390,6 +396,7 @@
 		CE003CBB11242D00004B0AA7 /* proxies */ = {
 			isa = PBXGroup;
 			children = (
+				CE22399E148FFE4F00B3DC99 /* PyColumns.h */,
 				CE003CBC11242D00004B0AA7 /* PyGUI.h */,
 				CE003CBD11242D00004B0AA7 /* PyOutline.h */,
 				CE0A0C131175A28100DCA3C6 /* PyTable.h */,
@@ -647,6 +654,7 @@
 				CE84C9B91423AE410050A6AD /* HSPopUpList.m in Sources */,
 				CE84C9BA1423AE410050A6AD /* HSSelectableList.m in Sources */,
 				CE2E87FD142BC92C00519A68 /* HSQuicklook.m in Sources */,
+				CE2239A2148FFE6600B3DC99 /* HSColumns.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -816,9 +824,12 @@
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = "dupeGuru ME";
 				WRAPPER_EXTENSION = app;
 			};
@@ -851,8 +862,11 @@
 		CED596C6111AF56D00C0CF2B /* dev */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = "dupeGuru ME";
 				WRAPPER_EXTENSION = app;
 			};

cocoa/pe/InfoTemplate.plist

@@ -22,6 +22,8 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{version}</string>
 	<key>CFBundleVersion</key>
 	<string>{version}</string>
 	<key>NSMainNibFile</key>

cocoa/pe/dupeguru.xcodeproj/project.pbxproj

@@ -823,8 +823,12 @@
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = "dupeGuru PE";
 				WRAPPER_EXTENSION = app;
 			};
@@ -857,7 +861,11 @@
 		CEE00FF1111AF37400BC1A77 /* dev */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = "dupeGuru PE";
 				WRAPPER_EXTENSION = app;
 			};

cocoa/se/InfoTemplate.plist

@@ -22,6 +22,8 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{version}</string>
 	<key>CFBundleVersion</key>
 	<string>{version}</string>
 	<key>NSMainNibFile</key>

cocoa/se/dupeguru.xcodeproj/project.pbxproj

@@ -804,8 +804,12 @@
 		C01FCF4C08A954540054247B /* release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = dupeGuru;
 				WRAPPER_EXTENSION = app;
 			};
@@ -838,7 +842,11 @@
 		CE85E850111AF63D00187B0D /* dev */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEPLOYMENT_LOCATION = YES;
+				DEPLOYMENT_POSTPROCESSING = YES;
+				DSTROOT = /;
 				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(PROJECT_DIR)";
 				PRODUCT_NAME = dupeGuru;
 				WRAPPER_EXTENSION = app;
 			};

core_me/__init__.py

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

core_se/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.3.0'
+__version__ = '3.3.1'
 __appname__ = 'dupeGuru'

help/changelog_me

@@ -1,3 +1,12 @@
+=== 6.2.0 (2011-12-07)
+
+* Added multiple-selection in folder selection dialog for a more efficient folder removal. (#179)
+* Fixed a crash in the prioritize dialog. (#178)
+* Fixed a bug where mass marking with a filter would mark more than filtered duplicates. (#181)
+* Fixed random hard crashes. [Mac OS X] (#183 #184)
+* Added Czech localization by Aleš Nehyba.
+* Added Italian localization by Paolo Rossi.
+
 === 6.1.1 (2011-10-03)
 
 * Fixed a couple of broken action bindings from v6.1.0.

help/changelog_se

@@ -1,3 +1,7 @@
+=== 3.3.1 (2011-12-02)
+
+* Fixed a couple of nasty crashes.
+
 === 3.3.0 (2011-11-30)
 
 * Added multiple-selection in folder selection dialog for a more efficient folder removal. (#179)

package.py

@@ -19,9 +19,9 @@ from hscommon.build import (build_dmg, add_to_pythonpath, print_and_do, copy_pac
 
 def package_cocoa(edition):
     app_path = {
-        'se': 'cocoa/se/build/release/dupeGuru.app',
-        'me': 'cocoa/me/build/release/dupeGuru ME.app',
-        'pe': 'cocoa/pe/build/release/dupeGuru PE.app',
+        'se': 'cocoa/se/dupeGuru.app',
+        'me': 'cocoa/me/dupeGuru ME.app',
+        'pe': 'cocoa/pe/dupeGuru PE.app',
     }[edition]
     build_dmg(app_path, '.')
 

qt/base/app.py

@@ -185,6 +185,12 @@ class DupeGuru(QObject):
     #--- Events
     def finishedLaunching(self):
         self.model.initial_registration_setup()
+        if sys.getfilesystemencoding() == 'ascii':
+            # No need to localize this, it's a debugging message.
+            msg = "Something is wrong with the way your system locale is set. If the files you're "\
+               "scanning have accented letters, you'll probably get a crash. It is advised that "\
+               "you set your system locale properly."
+            QMessageBox.warning(self.directories_dialog, "Wrong Locale", msg)
     
     def application_will_terminate(self):
         self.willSavePrefs.emit()

qt/me/results_model.py

@@ -7,7 +7,7 @@
 
 from qtlib.column import Column
 from ..base.results_model import ResultsModel as ResultsModelBase
-from core_se.result_table import ResultTable
+from core_me.result_table import ResultTable
 
 # Little hack to remove the 'marked' column which isn't there in the Qt GUI.
 del ResultTable.COLUMNS[0]

requirements.txt

@@ -1,4 +1,4 @@
-jobprogress>=1.0.2
+jobprogress>=1.0.3
 Send2Trash3k>=1.2.0
 sphinx>=1.1.0
 polib>=0.7.0