Brought dgpe qt up to speed for the 1.9.0 release.

pe v1.9.0
Updated dgpe help to include custom command description.
2026-01-25 16:11:39 +00:00 · 2010-04-15 10:05:33 +01:00 · 2010-04-15 10:41:36 +02:00 · 2010-04-15 10:40:34 +02:00 · 2010-04-15 10:38:53 +02:00 · 2010-04-15 10:38:30 +02:00
11 changed files with 774 additions and 513 deletions
--- a/.hgtags
+++ b/.hgtags
@@ -16,3 +16,4 @@ cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
 0a71306434bca51bea9a5d5ae54fe1bf0e4900d8 pe1.8.5
 556baf4a410779e9bbf43129de133e4c4b26d679 pe1.8.6
 9149024283959a50fe9a47a5f175b905d1672c19 se2.10.0
+388a7e5aef6385e515189f4a15b4c4fed3ae2fcf me5.8.0
--- a/cocoa/pe/Info.plist
+++ b/cocoa/pe/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.6</string>
+	<string>1.9.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
--- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
@@ -12,6 +12,9 @@
 		CE031751109B340A00517EE6 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031750109B340A00517EE6 /* Preferences.xib */; };
 		CE031754109B345200517EE6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE031753109B345200517EE6 /* MainMenu.xib */; };
 		CE073F6309CAE1A3005C1D2F /* dupeguru_pe_help in Resources */ = {isa = PBXBuildFile; fileRef = CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */; };
+		CE0C2AB61177011000BC749F /* HSTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2AB51177011000BC749F /* HSTable.m */; };
+		CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0C2ABB1177014200BC749F /* ProblemDialog.m */; };
+		CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE0C2AC71177021600BC749F /* ProblemDialog.xib */; };
 		CE15C8A80ADEB8B50061D4A5 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; };
 		CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; };
@@ -84,6 +87,13 @@
 		CE031750109B340A00517EE6 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
 		CE031753109B345200517EE6 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; };
 		CE073F5409CAE1A3005C1D2F /* dupeguru_pe_help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dupeguru_pe_help; path = ../../help_pe/dupeguru_pe_help; sourceTree = SOURCE_ROOT; };
+		CE0C2AAA117700E700BC749F /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = "<group>"; };
+		CE0C2AB41177011000BC749F /* HSTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSTable.h; sourceTree = "<group>"; };
+		CE0C2AB51177011000BC749F /* HSTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSTable.m; sourceTree = "<group>"; };
+		CE0C2ABA1177014200BC749F /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0C2ABB1177014200BC749F /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; };
+		CE0C2ABC1177014200BC749F /* PyProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyProblemDialog.h; path = ../base/PyProblemDialog.h; sourceTree = SOURCE_ROOT; };
+		CE0C2AC71177021600BC749F /* ProblemDialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ProblemDialog.xib; path = ../base/xib/ProblemDialog.xib; sourceTree = SOURCE_ROOT; };
 		CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = "<absolute>"; };
 		CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyDetailsPanel.h; path = ../base/PyDetailsPanel.h; sourceTree = SOURCE_ROOT; };
 		CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
@@ -180,7 +190,7 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Classes */ = {
+		080E96DDFE201D6D7F000001 /* DGPE */ = {
 			isa = PBXGroup;
 			children = (
 				CE381C9509914ACE003581CE /* AppDelegate.h */,
@@ -194,7 +204,7 @@
 				CE381C9B09914ADF003581CE /* ResultWindow.h */,
 				CE381C9A09914ADF003581CE /* ResultWindow.m */,
 			);
-			name = Classes;
+			name = DGPE;
 			sourceTree = "<group>";
 		};
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
@@ -227,7 +237,7 @@
 		29B97314FDCFA39411CA2CEA /* dupeguru */ = {
 			isa = PBXGroup;
 			children = (
-				080E96DDFE201D6D7F000001 /* Classes */,
+				080E96DDFE201D6D7F000001 /* DGPE */,
 				CE80DB1A0FC192AB0086DCA6 /* cocoalib */,
 				CE80DB810FC194BD0086DCA6 /* dgbase */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -276,6 +286,7 @@
 				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */,
 				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */,
 				CE031750109B340A00517EE6 /* Preferences.xib */,
+				CE0C2AC71177021600BC749F /* ProblemDialog.xib */,
 			);
 			path = xib;
 			sourceTree = "<group>";
@@ -335,19 +346,22 @@
 				CE6044EB0FE6796200B71262 /* DetailsPanel.m */,
 				CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */,
 				CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */,
-				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
 				CE9EA76F1122CA0B008CD2BC /* DirectoryOutline.h */,
 				CE9EA7701122CA0B008CD2BC /* DirectoryOutline.m */,
-				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
-				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE0C2ABA1177014200BC749F /* ProblemDialog.h */,
+				CE0C2ABB1177014200BC749F /* ProblemDialog.m */,
 				CE80DB880FC1951C0086DCA6 /* ResultWindow.h */,
 				CE80DB890FC1951C0086DCA6 /* ResultWindow.m */,
 				CE958658112C516400F95FD2 /* PyResultTree.h */,
 				CE95865A112C516400F95FD2 /* ResultOutline.h */,
 				CE95865B112C516400F95FD2 /* ResultOutline.m */,
-				CE958659112C516400F95FD2 /* PyStatsLabel.h */,
 				CE95865C112C516400F95FD2 /* StatsLabel.h */,
 				CE95865D112C516400F95FD2 /* StatsLabel.m */,
+				CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */,
+				CE18126F111C9D5100E49FCE /* PyDetailsPanel.h */,
+				CE9EA7711122CA0B008CD2BC /* PyDirectoryOutline.h */,
+				CE0C2ABC1177014200BC749F /* PyProblemDialog.h */,
+				CE958659112C516400F95FD2 /* PyStatsLabel.h */,
 			);
 			name = dgbase;
 			sourceTree = "<group>";
@@ -359,6 +373,8 @@
 				CE9EA7441122C96C008CD2BC /* HSGUIController.m */,
 				CE9EA7451122C96C008CD2BC /* HSOutline.h */,
 				CE9EA7461122C96C008CD2BC /* HSOutline.m */,
+				CE0C2AB41177011000BC749F /* HSTable.h */,
+				CE0C2AB51177011000BC749F /* HSTable.m */,
 				CE9EA7471122C96C008CD2BC /* HSWindowController.h */,
 				CE9EA7481122C96C008CD2BC /* HSWindowController.m */,
 			);
@@ -371,6 +387,7 @@
 			children = (
 				CE9EA74C1122C96C008CD2BC /* PyGUI.h */,
 				CE9EA74D1122C96C008CD2BC /* PyOutline.h */,
+				CE0C2AAA117700E700BC749F /* PyTable.h */,
 			);
 			name = proxies;
 			path = ../../cocoalib/proxies;
@@ -470,6 +487,7 @@
 				CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */,
 				CE7AC9191119911200D02F6C /* progress.xib in Resources */,
 				CE7AC91A1119911200D02F6C /* registration.xib in Resources */,
+				CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -509,6 +527,8 @@
 				CE9EA7721122CA0B008CD2BC /* DirectoryOutline.m in Sources */,
 				CE95865E112C516400F95FD2 /* ResultOutline.m in Sources */,
 				CE95865F112C516400F95FD2 /* StatsLabel.m in Sources */,
+				CE0C2AB61177011000BC749F /* HSTable.m in Sources */,
+				CE0C2ABD1177014200BC749F /* ProblemDialog.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/cocoa/pe/xib/Preferences.xib
+++ b/cocoa/pe/xib/Preferences.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.SystemVersion">10D573</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.HIToolboxVersion">460.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
@@ -41,14 +41,14 @@
 			<object class="NSUserDefaultsController" id="455472712">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>SUEnableAutomaticChecks</string>
+					<string>CustomCommand</string>
 				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
 			<object class="NSWindowTemplate" id="809668081">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{92, 350}, {352, 252}}</string>
+				<string key="NSWindowRect">{{92, 371}, {392, 231}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">dupeGuru PE Preferences</string>
 				<object class="NSMutableString" key="NSWindowClass">
@@ -64,12 +64,53 @@
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSSlider" id="266372855">
+						<object class="NSButton" id="789691362">
 							<reference key="NSNextResponder" ref="905655072"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{120, 213}, {181, 21}}</string>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{230, 12}, {148, 32}}</string>
 							<reference key="NSSuperview" ref="905655072"/>
 							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="173995265">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset to Defaults</string>
+								<object class="NSFont" key="NSSupport" id="882799568">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="789691362"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="882799568"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTabView" id="211771207">
+							<reference key="NSNextResponder" ref="905655072"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{13, 40}, {366, 185}}</string>
+							<reference key="NSSuperview" ref="905655072"/>
+							<object class="NSMutableArray" key="NSTabViewItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSTabViewItem" id="700068878">
+									<string key="NSIdentifier">1</string>
+									<object class="NSView" key="NSView" id="1073354031">
+										<reference key="NSNextResponder" ref="211771207"/>
+										<int key="NSvFlags">256</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSSlider" id="266372855">
+												<reference key="NSNextResponder" ref="1073354031"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{117, 117}, {181, 21}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
+												<bool key="NSEnabled">YES</bool>
 												<object class="NSSliderCell" key="NSCell" id="453640282">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">0</int>
@@ -93,10 +134,10 @@
 												</object>
 											</object>
 											<object class="NSTextField" id="869007847">
-							<reference key="NSNextResponder" ref="905655072"/>
+												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{122, 196}, {80, 13}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{119, 100}, {80, 13}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="106025161">
 													<int key="NSCellFlags">67239424</int>
@@ -121,7 +162,7 @@
 														<int key="NSColorSpace">6</int>
 														<string key="NSCatalogName">System</string>
 														<string key="NSColorName">controlTextColor</string>
-									<object class="NSColor" key="NSColor">
+														<object class="NSColor" key="NSColor" id="736922190">
 															<int key="NSColorSpace">3</int>
 															<bytes key="NSWhite">MAA</bytes>
 														</object>
@@ -129,10 +170,10 @@
 												</object>
 											</object>
 											<object class="NSTextField" id="171701149">
-							<reference key="NSNextResponder" ref="905655072"/>
+												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{219, 196}, {80, 13}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{216, 100}, {80, 13}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="397705219">
 													<int key="NSCellFlags">67239424</int>
@@ -145,10 +186,10 @@
 												</object>
 											</object>
 											<object class="NSTextField" id="638371207">
-							<reference key="NSNextResponder" ref="905655072"/>
+												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{17, 218}, {100, 14}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{14, 122}, {100, 14}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="812365472">
 													<int key="NSCellFlags">67239424</int>
@@ -165,10 +206,10 @@
 												</object>
 											</object>
 											<object class="NSButton" id="488256664">
-							<reference key="NSNextResponder" ref="905655072"/>
+												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{18, 152}, {214, 18}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{15, 56}, {214, 18}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="401283671">
 													<int key="NSCellFlags">67239424</int>
@@ -187,11 +228,74 @@
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
-						<object class="NSTextField" id="403531548">
-							<reference key="NSNextResponder" ref="905655072"/>
+											<object class="NSButton" id="722670516">
+												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{304, 218}, {31, 14}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{15, 76}, {214, 18}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="911281323">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Match scaled pictures together</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="722670516"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="990345653"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="472028782">
+												<reference key="NSNextResponder" ref="1073354031"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 14}, {283, 18}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="2297113">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Automatically check for updates</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="472028782"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="990345653"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="279087998">
+												<reference key="NSNextResponder" ref="1073354031"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 36}, {242, 18}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="287383961">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Remove empty folders on delete or move</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="279087998"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="990345653"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="403531548">
+												<reference key="NSNextResponder" ref="1073354031"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{301, 122}, {31, 14}}</string>
+												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="983190380">
 													<int key="NSCellFlags">67239424</int>
@@ -266,38 +370,47 @@
 													<reference key="NSTextColor" ref="538152464"/>
 												</object>
 											</object>
-						<object class="NSButton" id="789691362">
-							<reference key="NSNextResponder" ref="905655072"/>
+										</object>
+										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+										<reference key="NSSuperview" ref="211771207"/>
+									</object>
+									<string key="NSLabel">Basic</string>
+									<reference key="NSColor" ref="71910056"/>
+									<reference key="NSTabView" ref="211771207"/>
+								</object>
+								<object class="NSTabViewItem" id="1045400351">
+									<string key="NSIdentifier">2</string>
+									<object class="NSView" key="NSView" id="581039403">
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{190, 16}, {148, 32}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSButton" id="1018598123">
+												<reference key="NSNextResponder" ref="581039403"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 120}, {228, 18}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="173995265">
+												<object class="NSButtonCell" key="NSCell" id="42276474">
 													<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Reset to Defaults</string>
-								<object class="NSFont" key="NSSupport" id="882799568">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="789691362"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="882799568"/>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Use regular expressions when filtering</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="1018598123"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
+													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
 											<object class="NSTextField" id="748076392">
-							<reference key="NSNextResponder" ref="905655072"/>
+												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{20, 71}, {85, 13}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{14, 97}, {85, 13}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="936873031">
 													<int key="NSCellFlags">67239424</int>
@@ -309,11 +422,27 @@
 													<reference key="NSTextColor" ref="538152464"/>
 												</object>
 											</object>
-						<object class="NSPopUpButton" id="724953200">
-							<reference key="NSNextResponder" ref="905655072"/>
+											<object class="NSTextField" id="526155835">
+												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{110, 60}, {216, 26}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+												<string key="NSFrame">{{14, 69}, {306, 17}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="765798142">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">272629760</int>
+													<string key="NSContents">Custom Command (arguments: %d for dupe, %r for ref):</string>
+													<reference key="NSSupport" ref="649492068"/>
+													<reference key="NSControlView" ref="526155835"/>
+													<reference key="NSBackgroundColor" ref="71910056"/>
+													<reference key="NSTextColor" ref="538152464"/>
+												</object>
+											</object>
+											<object class="NSPopUpButton" id="724953200">
+												<reference key="NSNextResponder" ref="581039403"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{104, 90}, {216, 26}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="601288025">
 													<int key="NSCellFlags">-2076049856</int>
@@ -385,92 +514,56 @@
 													<int key="NSArrowPosition">1</int>
 												</object>
 											</object>
-						<object class="NSButton" id="722670516">
-							<reference key="NSNextResponder" ref="905655072"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{18, 172}, {214, 18}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
+											<object class="NSTextField" id="590530357">
+												<reference key="NSNextResponder" ref="581039403"/>
+												<int key="NSvFlags">266</int>
+												<string key="NSFrame">{{17, 47}, {312, 22}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="911281323">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Match scaled pictures together</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="722670516"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSAlternateImage" ref="990345653"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
+												<object class="NSTextFieldCell" key="NSCell" id="922246764">
+													<int key="NSCellFlags">-1804468671</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="882799568"/>
+													<reference key="NSControlView" ref="590530357"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<object class="NSColor" key="NSBackgroundColor">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">textBackgroundColor</string>
+														<object class="NSColor" key="NSColor">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
 														</object>
 													</object>
-						<object class="NSButton" id="472028782">
-							<reference key="NSNextResponder" ref="905655072"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{18, 90}, {283, 18}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="2297113">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Automatically check for updates</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="472028782"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSAlternateImage" ref="990345653"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="279087998">
-							<reference key="NSNextResponder" ref="905655072"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{18, 112}, {242, 18}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="287383961">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Remove empty folders on delete or move</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="279087998"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSAlternateImage" ref="990345653"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="1018598123">
-							<reference key="NSNextResponder" ref="905655072"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{18, 132}, {228, 18}}</string>
-							<reference key="NSSuperview" ref="905655072"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="42276474">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Use regular expressions when filtering</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="1018598123"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<reference key="NSAlternateImage" ref="990345653"/>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">textColor</string>
+														<reference key="NSColor" ref="736922190"/>
 													</object>
 												</object>
 											</object>
-					<string key="NSFrameSize">{352, 252}</string>
+										</object>
+										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+									</object>
+									<string key="NSLabel">Advanced</string>
+									<reference key="NSColor" ref="71910056"/>
+									<reference key="NSTabView" ref="211771207"/>
+								</object>
+							</object>
+							<reference key="NSSelectedTabViewItem" ref="700068878"/>
+							<reference key="NSFont" ref="882799568"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<reference ref="1073354031"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{392, 231}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -681,6 +774,22 @@
 					</object>
 					<int key="connectionID">58</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.CustomCommand</string>
+						<reference key="source" ref="590530357"/>
+						<reference key="destination" ref="455472712"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="590530357"/>
+							<reference key="NSDestination" ref="455472712"/>
+							<string key="NSLabel">value: values.CustomCommand</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.CustomCommand</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">68</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -730,76 +839,11 @@
 						<reference key="object" ref="905655072"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1018598123"/>
-							<reference ref="279087998"/>
-							<reference ref="472028782"/>
-							<reference ref="722670516"/>
-							<reference ref="724953200"/>
-							<reference ref="748076392"/>
+							<reference ref="211771207"/>
 							<reference ref="789691362"/>
-							<reference ref="403531548"/>
-							<reference ref="488256664"/>
-							<reference ref="638371207"/>
-							<reference ref="171701149"/>
-							<reference ref="869007847"/>
-							<reference ref="266372855"/>
 						</object>
 						<reference key="parent" ref="809668081"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="1018598123"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="42276474"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="279087998"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="287383961"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="472028782"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="2297113"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="722670516"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="911281323"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="724953200"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="601288025"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="748076392"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="936873031"/>
-						</object>
-						<reference key="parent" ref="905655072"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">10</int>
 						<reference key="object" ref="789691362"/>
@@ -810,49 +854,67 @@
 						<reference key="parent" ref="905655072"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="403531548"/>
+						<int key="objectID">24</int>
+						<reference key="object" ref="173995265"/>
+						<reference key="parent" ref="789691362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="211771207"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="983190380"/>
+							<reference ref="700068878"/>
+							<reference ref="1045400351"/>
 						</object>
 						<reference key="parent" ref="905655072"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="488256664"/>
+						<int key="objectID">60</int>
+						<reference key="object" ref="700068878"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="401283671"/>
+							<reference ref="1073354031"/>
 						</object>
-						<reference key="parent" ref="905655072"/>
+						<reference key="parent" ref="211771207"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="638371207"/>
+						<int key="objectID">61</int>
+						<reference key="object" ref="1045400351"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="812365472"/>
+							<reference ref="581039403"/>
 						</object>
-						<reference key="parent" ref="905655072"/>
+						<reference key="parent" ref="211771207"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="171701149"/>
+						<int key="objectID">62</int>
+						<reference key="object" ref="581039403"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="397705219"/>
+							<reference ref="1018598123"/>
+							<reference ref="724953200"/>
+							<reference ref="748076392"/>
+							<reference ref="526155835"/>
+							<reference ref="590530357"/>
 						</object>
-						<reference key="parent" ref="905655072"/>
+						<reference key="parent" ref="1045400351"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="869007847"/>
+						<int key="objectID">63</int>
+						<reference key="object" ref="1073354031"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="106025161"/>
+							<reference ref="722670516"/>
+							<reference ref="488256664"/>
+							<reference ref="638371207"/>
+							<reference ref="171701149"/>
+							<reference ref="869007847"/>
+							<reference ref="266372855"/>
+							<reference ref="472028782"/>
+							<reference ref="279087998"/>
+							<reference ref="403531548"/>
 						</object>
-						<reference key="parent" ref="905655072"/>
+						<reference key="parent" ref="700068878"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
@@ -861,33 +923,120 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="453640282"/>
 						</object>
-						<reference key="parent" ref="905655072"/>
+						<reference key="parent" ref="1073354031"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">17</int>
 						<reference key="object" ref="453640282"/>
 						<reference key="parent" ref="266372855"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="869007847"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="106025161"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">18</int>
 						<reference key="object" ref="106025161"/>
 						<reference key="parent" ref="869007847"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="171701149"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="397705219"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
 						<reference key="object" ref="397705219"/>
 						<reference key="parent" ref="171701149"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="638371207"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="812365472"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">20</int>
 						<reference key="object" ref="812365472"/>
 						<reference key="parent" ref="638371207"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="488256664"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="401283671"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">21</int>
 						<reference key="object" ref="401283671"/>
 						<reference key="parent" ref="488256664"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="722670516"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="911281323"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="911281323"/>
+						<reference key="parent" ref="722670516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="472028782"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="2297113"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="2297113"/>
+						<reference key="parent" ref="472028782"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="279087998"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="287383961"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">33</int>
+						<reference key="object" ref="287383961"/>
+						<reference key="parent" ref="279087998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="403531548"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="983190380"/>
+						</object>
+						<reference key="parent" ref="1073354031"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">22</int>
 						<reference key="object" ref="983190380"/>
@@ -903,15 +1052,42 @@
 						<reference key="parent" ref="983190380"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="173995265"/>
-						<reference key="parent" ref="789691362"/>
+						<int key="objectID">4</int>
+						<reference key="object" ref="1018598123"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="42276474"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">34</int>
+						<reference key="object" ref="42276474"/>
+						<reference key="parent" ref="1018598123"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="748076392"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="936873031"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">25</int>
 						<reference key="object" ref="936873031"/>
 						<reference key="parent" ref="748076392"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="724953200"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="601288025"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">26</int>
 						<reference key="object" ref="601288025"/>
@@ -926,15 +1102,15 @@
 						<reference key="object" ref="968539421"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="509553711"/>
-							<reference ref="169587822"/>
 							<reference ref="899286415"/>
+							<reference ref="169587822"/>
+							<reference ref="509553711"/>
 						</object>
 						<reference key="parent" ref="601288025"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">28</int>
-						<reference key="object" ref="509553711"/>
+						<int key="objectID">30</int>
+						<reference key="object" ref="899286415"/>
 						<reference key="parent" ref="968539421"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -943,29 +1119,37 @@
 						<reference key="parent" ref="968539421"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">30</int>
-						<reference key="object" ref="899286415"/>
+						<int key="objectID">28</int>
+						<reference key="object" ref="509553711"/>
 						<reference key="parent" ref="968539421"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">31</int>
-						<reference key="object" ref="911281323"/>
-						<reference key="parent" ref="722670516"/>
+						<int key="objectID">64</int>
+						<reference key="object" ref="526155835"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="765798142"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="2297113"/>
-						<reference key="parent" ref="472028782"/>
+						<int key="objectID">65</int>
+						<reference key="object" ref="765798142"/>
+						<reference key="parent" ref="526155835"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">33</int>
-						<reference key="object" ref="287383961"/>
-						<reference key="parent" ref="279087998"/>
+						<int key="objectID">66</int>
+						<reference key="object" ref="590530357"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="922246764"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">34</int>
-						<reference key="object" ref="42276474"/>
-						<reference key="parent" ref="1018598123"/>
+						<int key="objectID">67</int>
+						<reference key="object" ref="922246764"/>
+						<reference key="parent" ref="590530357"/>
 					</object>
 				</object>
 			</object>
@@ -1025,8 +1209,18 @@
 					<string>4.ImportedFromIB2</string>
 					<string>5.IBPluginDependency</string>
 					<string>5.ImportedFromIB2</string>
+					<string>59.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.ImportedFromIB2</string>
+					<string>60.IBPluginDependency</string>
+					<string>61.IBPluginDependency</string>
+					<string>62.IBPluginDependency</string>
+					<string>63.IBPluginDependency</string>
+					<string>64.IBPluginDependency</string>
+					<string>64.ImportedFromIB2</string>
+					<string>65.IBPluginDependency</string>
+					<string>66.IBPluginDependency</string>
+					<string>67.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
 					<string>8.IBPluginDependency</string>
@@ -1056,9 +1250,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 593}, {352, 252}}</string>
+					<string>{{88, 614}, {392, 231}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 593}, {352, 252}}</string>
+					<string>{{88, 614}, {392, 231}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{213, 107}</string>
@@ -1089,8 +1283,18 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -1114,7 +1318,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">58</int>
+			<int key="maxID">68</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1572,6 +1776,22 @@
 						<string key="minorKey">AppKit.framework/Headers/NSSliderCell.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTabView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTabView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTabViewItem</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTabViewItem.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSTextField</string>
 					<string key="superclassName">NSControl</string>
--- a/core_pe/matchbase.py
+++ b/core_pe/matchbase.py
@@ -8,11 +8,9 @@

 import logging
 import multiprocessing
-from Queue import Empty
-from collections import defaultdict
+from collections import defaultdict, deque

 from hsutil import job
-from hsutil.misc import dedupe

 from core.engine import Match
 from .block import avgdiff, DifferentBlockCountError, NoBlocksError
@@ -76,13 +74,6 @@ def async_compare(ref_id, other_ids, dbname, threshold):
    return results
    
 def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nulljob):
-    def empty_out_queue(queue, into):
-        try:
-            while True:
-                into.append(queue.get(block=False))
-        except Empty:
-            pass
-    
    j = j.start_subjob([3, 7])
    pictures = prepare_pictures(pictures, cache_path, j)
    j = j.start_subjob([9, 1], 'Preparing for matching')
@@ -100,7 +91,7 @@ def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nul
    cache.close()
    pictures = [p for p in pictures if hasattr(p, 'cache_id')]
    pool = multiprocessing.Pool()
-    async_results = []
+    async_results = deque()
    matches = []
    pictures_copy = set(pictures)
    for ref in j.iter_with_progress(pictures, 'Matched %d/%d pictures'):
@@ -118,8 +109,10 @@ def getmatches(pictures, cache_path, threshold=75, match_scaled=False, j=job.nul
                args = (ref.cache_id, cache_ids[:ARG_LIMIT], cache_path, threshold)
                async_results.append(pool.apply_async(async_compare, args))
                cache_ids = cache_ids[ARG_LIMIT:]
-        if len(async_results) > RESULTS_QUEUE_LIMIT:
-            result = async_results.pop(0)
+        # We use a while here because it's possible that more than one result has been added if
+        # ARG_LIMIT has been reached.
+        while len(async_results) > RESULTS_QUEUE_LIMIT:
+            result = async_results.popleft()
            matches.extend(result.get())
    for result in async_results: # process the rest of the results
        matches.extend(result.get())
--- a/help_pe/changelog.yaml
+++ b/help_pe/changelog.yaml
@@ -1,3 +1,9 @@
+- date: 2010-04-15
+  version: 1.9.0
+  description: |
+    * Improved error messages when files can't be sent to trash, moved or copied.
+    * Added a custom command invocation action. (#12)
+    * Filters are now applied on whole paths. (#4)
 - date: 2010-04-08
  version: 1.8.6
  description: |
--- a/help_pe/templates/preferences.mako
+++ b/help_pe/templates/preferences.mako
@@ -21,3 +21,11 @@
 * **Recreate absolute path:** The source file's path will be re-created in the destination directory in it's entirety. For example, if you move "/Users/foobar/Picture/2006/06/photo.jpg" to the destination "/Users/foobar/MyDestination", the final destination for the file will be "/Users/foobar/MyDestination/Users/foobar/Picture/2006/06".

 In all cases, dupeGuru PE nicely handles naming conflicts by prepending a number to the destination filename if the filename already exists in the destination.
+
+**Custom Command:** This preference determines the command that will be invoked by the "Invoke Custom Command" action. You can invoke any external application through this action. This can be useful if, for example, you have a nice diffing application installed.
+
+The format of the command is the same as what you would write in the command line, except that there are 2 placeholders: **%d** and **%r**. These placeholders will be replaced by the path of the selected dupe (%d) and the path of the selected dupe's reference file (%r).
+  
+If the path to your executable contains space characters, you should enclose it in "" quotes. You should also enclose placeholders in quotes because it's very possible that paths to dupes and refs will contain spaces. Here's an example custom command:
+  
+    "C:\Program Files\SuperDiffProg\SuperDiffProg.exe" "%d" "%r"
--- a/help_pe/templates/results.mako
+++ b/help_pe/templates/results.mako
@@ -70,4 +70,5 @@ Action Menu
 * **Add Selected to Ignore List:** This first removes all selected duplicates from results, and then add the match of that duplicate and the current reference in the ignore list. This match will not come up again in further scan. The duplicate itself might come back, but it will be matched with another reference file. You can clear the ignore list with the Clear Ignore List command.
 * **Open Selected with Default Application:** Open the file with the application associated with selected file's type.
 * **Reveal Selected in Finder:** Open the folder containing selected file.
+* **Invoke Custom Command:** Invokes the external application you've set up in your preferences using the current selection as arguments in the invocation.
 * **Rename Selected:** Prompts you for a new name, and then rename the selected file.
--- a/qt/pe/app.py
+++ b/qt/pe/app.py
@@ -57,7 +57,7 @@ class DupeGuru(DupeGuruBase):
    EDITION = 'pe'
    LOGO_NAME = 'logo_pe'
    NAME = 'dupeGuru Picture Edition'
-    VERSION = '1.8.6'
+    VERSION = '1.9.0'
    DELTA_COLUMNS = frozenset([2, 5, 6])
    
    def __init__(self):
--- a/qt/pe/preferences_dialog.py
+++ b/qt/pe/preferences_dialog.py
@@ -35,6 +35,7 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog):
        setchecked(self.useRegexpBox, prefs.use_regexp)
        setchecked(self.removeEmptyFoldersBox, prefs.remove_empty_folders)
        self.copyMoveDestinationComboBox.setCurrentIndex(prefs.destination_type)
+        self.customCommandEdit.setText(prefs.custom_command)
    
    def save(self):
        prefs = self.app.prefs
@@ -45,6 +46,7 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog):
        prefs.use_regexp = ischecked(self.useRegexpBox)
        prefs.remove_empty_folders = ischecked(self.removeEmptyFoldersBox)
        prefs.destination_type = self.copyMoveDestinationComboBox.currentIndex()
+        prefs.custom_command = unicode(self.customCommandEdit.text())
    
    def resetToDefaults(self):
        self.load(preferences.Preferences())
--- a/qt/pe/preferences_dialog.ui
+++ b/qt/pe/preferences_dialog.ui
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>366</width>
-    <height>249</height>
+    <width>304</width>
+    <height>263</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -19,9 +19,9 @@
  <property name="modal">
   <bool>true</bool>
  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0,0,0,1">
+    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
@@ -192,6 +192,16 @@
       </item>
      </layout>
     </item>
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Custom Command (arguments: %d for dupe %r for ref):</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="customCommandEdit"/>
+     </item>
    </layout>
   </item>
   <item>
Author	SHA1	Message	Date
Virgil Dupras	378589a473	Brought dgpe qt up to speed for the 1.9.0 release.	2010-04-15 10:05:33 +01:00
Virgil Dupras	fa264972a4	pe v1.9.0	2010-04-15 10:41:36 +02:00
Virgil Dupras	6b10e01c03	Updated dgpe help to include custom command description.	2010-04-15 10:40:34 +02:00
Virgil Dupras	5a6d74ab37	Brought dgpe cocoa up to speed for the 1.9 release.	2010-04-15 10:38:53 +02:00
Virgil Dupras	73f1bb6968	Tweaked dgpe's matching to work better with huge scans.	2010-04-15 10:38:30 +02:00
Virgil Dupras	d1a7f51859	Added tag me5.8.0 for changeset 388a7e5aef63	2010-04-14 14:08:24 +02:00