[#144 state:fixed] Fixed crash on error handling under windows when sys.stderr is None.

.hgtags

@@ -40,3 +40,7 @@ ca93352ce35184853ad9fcb881935a43a8b1e249 me5.10.3
 44f6ff67066c083f79daa18a9d2f1ab909e0a62e me5.10.4
 3f71a8f5bf8f6d0729748a27af9163e013723294 pe1.11.3
 0056293b0dade8b8230f68c1fe6f0c2d1e0b74d8 se2.12.3
+8d12cab3b12b723e3a86d02cf8002731a0f73f95 se3.0.0
+778876a8a9787658aa6adf6944b53aebcb7faeea se3.0.1
+f1d40b556c01f32c58f9ef9f9acac5b78e01ba7a pe2.0.0
+2fd901a516f8cb6b4438491f63f2ebfd52a57c13 me6.0.0

cocoa/base/DirectoryOutline.h

@@ -10,6 +10,8 @@ http://www.hardcoded.net/licenses/bsd_license
 #import "HSOutline.h"
 #import "PyDirectoryOutline.h"
 
+#define DGAddedFoldersNotification @"DGAddedFoldersNotification"
+
 @interface DirectoryOutline : HSOutline {}
 - (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
 - (PyDirectoryOutline *)py;

cocoa/base/DirectoryOutline.m

@@ -49,12 +49,15 @@ http://www.hardcoded.net/licenses/bsd_license
     sourceDragMask = [info draggingSourceOperationMask];
     pboard = [info draggingPasteboard];
     if ([[pboard types] containsObject:NSFilenamesPboardType]) {
-        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+        NSArray *foldernames = [pboard propertyListForType:NSFilenamesPboardType];
         if (!(sourceDragMask & NSDragOperationLink))
             return NO;
-        for (NSString *filename in filenames) {
+        for (NSString *foldername in foldernames) {
-            [[self py] addDirectory:filename];
+            [[self py] addDirectory:foldername];
         }
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObject:foldernames forKey:@"foldernames"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:DGAddedFoldersNotification
+            object:self userInfo:userInfo];
     }
     return YES;
 }

cocoa/base/DirectoryPanel.m

@@ -27,6 +27,8 @@ http://www.hardcoded.net/licenses/bsd_license
     [self refreshRemoveButtonText];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
         name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outlineAddedFolders:)
+        name:DGAddedFoldersNotification object:outline];
     return self;
 }
 
@@ -162,4 +164,12 @@ http://www.hardcoded.net/licenses/bsd_license
     [self refreshRemoveButtonText];
 }
 
+- (void)outlineAddedFolders:(NSNotification *)aNotification
+{
+    NSArray *foldernames = [[aNotification userInfo] objectForKey:@"foldernames"];
+    for (NSString *foldername in foldernames) {
+        [_recentDirectories addFile:foldername];
+    }
+}
+
 @end

cocoa/base/PyDupeGuru.h

@@ -45,6 +45,7 @@ http://www.hardcoded.net/licenses/bsd_license
 - (NSNumber *)getMarkCount;
 - (BOOL)scanWasProblematic;
 - (BOOL)resultsAreModified;
+- (NSArray *)deltaColumns;
 
 //Scanning options
 - (void)setMinMatchPercentage:(NSNumber *)percentage;

cocoa/base/ResultWindow.m

@@ -29,6 +29,7 @@ http://www.hardcoded.net/licenses/bsd_license
     [self fillColumnsMenu];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openClicked:)];
+    [table setDeltaColumns:[Utils array2IndexSet:[py deltaColumns]]];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];

cocoa/base/en.lproj/ResultWindow.xib

@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
+			<integer value="4"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1026,14 +1026,6 @@
 					</object>
 					<int key="connectionID">66</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="489091452"/>
-						<reference key="destination" ref="593436906"/>
-					</object>
-					<int key="connectionID">75</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeSelected:</string>
@@ -1090,6 +1082,14 @@
 					</object>
 					<int key="connectionID">82</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="387493015"/>
+						<reference key="destination" ref="593436906"/>
+					</object>
+					<int key="connectionID">83</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1668,7 +1668,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">82</int>
+			<int key="maxID">83</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1754,6 +1754,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
@@ -1761,6 +1762,7 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSMenu</string>
+							<string>NSMenu</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSMenu</string>
 						</object>
@@ -1769,12 +1771,17 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">actionsMenu</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">columnsMenu</string>
 								<string key="candidateClassName">NSMenu</string>
@@ -1851,17 +1858,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">removeDeadTracks:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">removeDeadTracks:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">removeDeadTracks:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">ResultWindow.h</string>

cocoa/base/fr.lproj/DirectoryPanel.strings

@@ -14,7 +14,7 @@
 "56.title" = "Référence";
 
 /* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
-"57.title" = "Exclus";
+"57.title" = "Exclu";
 
 /* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
 "71.title" = "Sélectionnez les dossiers à scanner et cliquez sur Scan.";

cocoa/base/fr.lproj/DirectoryPanel.xib

@@ -191,7 +191,7 @@
 																</object>
 																<object class="NSMenuItem" id="142495353">
 																	<reference key="NSMenu" ref="104112446"/>
-																	<string key="NSTitle">Exclus</string>
+																	<string key="NSTitle">Exclu</string>
 																	<string key="NSKeyEquiv"/>
 																	<int key="NSMnemonicLoc">2147483647</int>
 																	<string key="NSAction">_popUpItemAction:</string>

cocoa/base/fr.lproj/ResultWindow.xib

@@ -1024,14 +1024,6 @@
 					</object>
 					<int key="connectionID">66</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">menu</string>
-						<reference key="source" ref="489091452"/>
-						<reference key="destination" ref="593436906"/>
-					</object>
-					<int key="connectionID">75</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeSelected:</string>
@@ -1088,6 +1080,14 @@
 					</object>
 					<int key="connectionID">82</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="387493015"/>
+						<reference key="destination" ref="593436906"/>
+					</object>
+					<int key="connectionID">83</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1668,7 +1668,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">82</int>
+			<int key="maxID">83</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1754,6 +1754,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
@@ -1761,6 +1762,7 @@
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSMenu</string>
+							<string>NSMenu</string>
 							<string>PyDupeGuruBase</string>
 							<string>NSMenu</string>
 						</object>
@@ -1769,12 +1771,17 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionsMenu</string>
 							<string>columnsMenu</string>
 							<string>py</string>
 							<string>recentResultsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">actionsMenu</string>
+								<string key="candidateClassName">NSMenu</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">columnsMenu</string>
 								<string key="candidateClassName">NSMenu</string>
@@ -1851,17 +1858,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">ResultWindow</string>
 					<string key="superclassName">ResultWindowBase</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">removeDeadTracks:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">removeDeadTracks:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">removeDeadTracks:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">ResultWindow.h</string>

cocoa/me/ResultWindow.m

@@ -14,15 +14,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @implementation ResultWindow
 /* Override */
-- (id)initWithParentApp:(AppDelegateBase *)aApp;
-{
-    self = [super initWithParentApp:aApp];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,6)];
-    [deltaColumns removeIndex:6];
-    [table setDeltaColumns:deltaColumns];
-    return self;
-}
-
 - (void)setScanOptions
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];

cocoa/me/en.lproj/Preferences.xib

@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="3"/>
+			<integer value="115"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -34,6 +34,10 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSUserDefaultsController" id="579641073">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>DebugMode</string>
+				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
 			<object class="NSWindowTemplate" id="793317856">
@@ -691,7 +695,7 @@
 											<object class="NSTextField" id="519483808">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 146}, {332, 13}}</string>
+												<string key="NSFrame">{{14, 126}, {332, 13}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="142188233">
@@ -707,7 +711,7 @@
 											<object class="NSTextField" id="839713145">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 189}, {332, 17}}</string>
+												<string key="NSFrame">{{14, 169}, {332, 17}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="380716547">
@@ -723,7 +727,7 @@
 											<object class="NSPopUpButton" id="1046542754">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 114}, {256, 26}}</string>
+												<string key="NSFrame">{{14, 94}, {256, 26}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="923770094">
@@ -793,7 +797,7 @@
 											<object class="NSTextField" id="330569030">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 167}, {326, 22}}</string>
+												<string key="NSFrame">{{17, 147}, {326, 22}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="573680954">
@@ -841,6 +845,27 @@
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
+											<object class="NSButton" id="476462426">
+												<reference key="NSNextResponder" ref="76055040"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 192}, {265, 18}}</string>
+												<reference key="NSSuperview" ref="76055040"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="29064087">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Debug mode (restart required)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="476462426"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="150447483"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
 										</object>
 										<string key="NSFrame">{{10, 33}, {360, 251}}</string>
 									</object>
@@ -1491,6 +1516,22 @@
 					</object>
 					<int key="connectionID">128</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="476462426"/>
+						<reference key="destination" ref="579641073"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="476462426"/>
+							<reference key="NSDestination" ref="579641073"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">132</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1594,10 +1635,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="836095588"/>
 							<reference ref="1065764374"/>
-							<reference ref="839713145"/>
+							<reference ref="476462426"/>
-							<reference ref="330569030"/>
 							<reference ref="519483808"/>
+							<reference ref="839713145"/>
 							<reference ref="1046542754"/>
+							<reference ref="330569030"/>
 						</object>
 						<reference key="parent" ref="963172262"/>
 					</object>
@@ -2065,6 +2107,20 @@
 						<reference key="object" ref="621426332"/>
 						<reference key="parent" ref="1065764374"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="476462426"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="29064087"/>
+						</object>
+						<reference key="parent" ref="76055040"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="29064087"/>
+						<reference key="parent" ref="476462426"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2094,11 +2150,16 @@
 					<string>122.IBViewBoundsToFrameTransform</string>
 					<string>123.IBPluginDependency</string>
 					<string>125.IBPluginDependency</string>
+					<string>125.IBViewBoundsToFrameTransform</string>
 					<string>125.ImportedFromIB2</string>
 					<string>126.IBPluginDependency</string>
+					<string>129.IBPluginDependency</string>
+					<string>129.IBViewBoundsToFrameTransform</string>
+					<string>129.ImportedFromIB2</string>
 					<string>13.IBPluginDependency</string>
 					<string>13.IBViewBoundsToFrameTransform</string>
 					<string>13.ImportedFromIB2</string>
+					<string>130.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
 					<string>14.IBViewBoundsToFrameTransform</string>
 					<string>14.ImportedFromIB2</string>
@@ -2225,31 +2286,40 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwzAAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwzQAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwx8AAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwyMAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAw2QAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw18AAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
 						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwggAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC0AAAwvIAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwuQAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwuYAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwwUAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2386,7 +2456,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">128</int>
+			<int key="maxID">132</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

cocoa/me/fr.lproj/Preferences.strings

@@ -97,3 +97,6 @@
 
 /* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "126"; */
 "126.title" = "Ignorer doublons avec hardlink vers le même fichier";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "130"; */
+"130.title" = "Mode de déboguage (redémarrage requis)";

cocoa/me/fr.lproj/Preferences.xib

@@ -335,7 +335,7 @@
 													<reference key="NSControlView" ref="102571342"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="161291571">
+													<object class="NSCustomResource" key="NSNormalImage" id="306944338">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -362,7 +362,7 @@
 													<reference key="NSControlView" ref="527948380"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -465,7 +465,7 @@
 													<reference key="NSControlView" ref="996173927"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -487,7 +487,7 @@
 													<reference key="NSControlView" ref="147113892"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -509,7 +509,7 @@
 													<reference key="NSControlView" ref="367077416"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -547,7 +547,7 @@
 													<reference key="NSControlView" ref="24386232"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -569,7 +569,7 @@
 													<reference key="NSControlView" ref="28878355"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -591,7 +591,7 @@
 													<reference key="NSControlView" ref="964877114"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -613,7 +613,7 @@
 													<reference key="NSControlView" ref="144566514"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -635,7 +635,7 @@
 													<reference key="NSControlView" ref="180911463"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -657,7 +657,7 @@
 													<reference key="NSControlView" ref="422320464"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -694,7 +694,7 @@
 													<reference key="NSControlView" ref="836095588"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -705,7 +705,7 @@
 											<object class="NSTextField" id="519483808">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 146}, {332, 13}}</string>
+												<string key="NSFrame">{{14, 126}, {332, 13}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="142188233">
@@ -721,7 +721,7 @@
 											<object class="NSTextField" id="839713145">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 189}, {332, 17}}</string>
+												<string key="NSFrame">{{14, 169}, {332, 17}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="380716547">
@@ -737,7 +737,7 @@
 											<object class="NSPopUpButton" id="1046542754">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 114}, {256, 26}}</string>
+												<string key="NSFrame">{{14, 94}, {256, 26}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="923770094">
@@ -807,7 +807,7 @@
 											<object class="NSTextField" id="330569030">
 												<reference key="NSNextResponder" ref="76055040"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 167}, {326, 22}}</string>
+												<string key="NSFrame">{{17, 147}, {326, 22}}</string>
 												<reference key="NSSuperview" ref="76055040"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="573680954">
@@ -848,7 +848,29 @@
 													<reference key="NSControlView" ref="1065764374"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="161291571"/>
+													<reference key="NSNormalImage" ref="306944338"/>
+													<reference key="NSAlternateImage" ref="150447483"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="476462426">
+												<reference key="NSNextResponder" ref="76055040"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 192}, {265, 18}}</string>
+												<reference key="NSSuperview" ref="76055040"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="29064087">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mode de déboguage (redémarrage requis)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="476462426"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="306944338"/>
 													<reference key="NSAlternateImage" ref="150447483"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -1505,6 +1527,22 @@
 					</object>
 					<int key="connectionID">128</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="476462426"/>
+						<reference key="destination" ref="579641073"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="476462426"/>
+							<reference key="NSDestination" ref="579641073"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">132</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1608,10 +1646,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="836095588"/>
 							<reference ref="1065764374"/>
-							<reference ref="839713145"/>
+							<reference ref="476462426"/>
-							<reference ref="330569030"/>
 							<reference ref="519483808"/>
+							<reference ref="839713145"/>
 							<reference ref="1046542754"/>
+							<reference ref="330569030"/>
 						</object>
 						<reference key="parent" ref="963172262"/>
 					</object>
@@ -2079,6 +2118,20 @@
 						<reference key="object" ref="621426332"/>
 						<reference key="parent" ref="1065764374"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="476462426"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="29064087"/>
+						</object>
+						<reference key="parent" ref="76055040"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="29064087"/>
+						<reference key="parent" ref="476462426"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2108,11 +2161,16 @@
 					<string>122.IBViewBoundsToFrameTransform</string>
 					<string>123.IBPluginDependency</string>
 					<string>125.IBPluginDependency</string>
+					<string>125.IBViewBoundsToFrameTransform</string>
 					<string>125.ImportedFromIB2</string>
 					<string>126.IBPluginDependency</string>
+					<string>129.IBPluginDependency</string>
+					<string>129.IBViewBoundsToFrameTransform</string>
+					<string>129.ImportedFromIB2</string>
 					<string>13.IBPluginDependency</string>
 					<string>13.IBViewBoundsToFrameTransform</string>
 					<string>13.ImportedFromIB2</string>
+					<string>130.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
 					<string>14.IBViewBoundsToFrameTransform</string>
 					<string>14.ImportedFromIB2</string>
@@ -2240,31 +2298,40 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwzAAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwzQAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwx8AAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwyMAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAw2QAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw18AAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
 						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwggAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABC0AAAwvIAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwuQAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwuYAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwwUAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2402,7 +2469,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">128</int>
+			<int key="maxID">132</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

cocoa/pe/ResultWindow.m

@@ -14,15 +14,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @implementation ResultWindow
 /* Override */
-- (id)initWithParentApp:(AppDelegateBase *)aApp;
-{
-    self = [super initWithParentApp:aApp];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndex:2];
-    [deltaColumns addIndex:5];
-    [table setDeltaColumns:deltaColumns];
-    return self;
-}
-
 - (void)initResultColumns
 {
     NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];

cocoa/pe/en.lproj/Preferences.xib

@@ -34,12 +34,16 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSUserDefaultsController" id="455472712">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>DebugMode</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, 371}, {392, 231}}</string>
+				<string key="NSWindowRect">{{92, 348}, {392, 254}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">dupeGuru PE Preferences</string>
 				<object class="NSMutableString" key="NSWindowClass">
@@ -85,7 +89,7 @@
 						<object class="NSTabView" id="211771207">
 							<reference key="NSNextResponder" ref="905655072"/>
 							<int key="NSvFlags">12</int>
-							<string key="NSFrame">{{13, 40}, {366, 185}}</string>
+							<string key="NSFrame">{{13, 40}, {366, 208}}</string>
 							<reference key="NSSuperview" ref="905655072"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -99,7 +103,7 @@
 											<object class="NSSlider" id="266372855">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{117, 117}, {181, 21}}</string>
+												<string key="NSFrame">{{117, 140}, {181, 21}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSSliderCell" key="NSCell" id="453640282">
@@ -127,7 +131,7 @@
 											<object class="NSTextField" id="869007847">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{119, 100}, {80, 13}}</string>
+												<string key="NSFrame">{{119, 123}, {80, 13}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="106025161">
@@ -163,7 +167,7 @@
 											<object class="NSTextField" id="171701149">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">289</int>
-												<string key="NSFrame">{{216, 100}, {80, 13}}</string>
+												<string key="NSFrame">{{216, 123}, {80, 13}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="397705219">
@@ -179,7 +183,7 @@
 											<object class="NSTextField" id="638371207">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 122}, {100, 14}}</string>
+												<string key="NSFrame">{{14, 145}, {100, 14}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="812365472">
@@ -199,7 +203,7 @@
 											<object class="NSButton" id="488256664">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 56}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 79}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="401283671">
@@ -222,7 +226,7 @@
 											<object class="NSButton" id="722670516">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 76}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 99}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="911281323">
@@ -243,7 +247,7 @@
 											<object class="NSButton" id="472028782">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 16}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 39}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="2297113">
@@ -264,7 +268,7 @@
 											<object class="NSButton" id="279087998">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 36}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 59}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="287383961">
@@ -285,7 +289,7 @@
 											<object class="NSTextField" id="403531548">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{301, 122}, {31, 14}}</string>
+												<string key="NSFrame">{{301, 145}, {31, 14}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="983190380">
@@ -364,7 +368,7 @@
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+										<string key="NSFrame">{{10, 33}, {346, 162}}</string>
 										<reference key="NSSuperview" ref="211771207"/>
 									</object>
 									<string key="NSLabel">Basic</string>
@@ -381,7 +385,7 @@
 											<object class="NSButton" id="1018598123">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 120}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 143}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="42276474">
@@ -402,7 +406,7 @@
 											<object class="NSButton" id="519470955">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 100}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 123}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="595497720">
@@ -420,10 +424,31 @@
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
+											<object class="NSButton" id="606836304">
+												<reference key="NSNextResponder" ref="581039403"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 103}, {316, 18}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="100803310">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Debug mode (restart required)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="606836304"/>
+													<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="748076392">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 34}, {318, 13}}</string>
+												<string key="NSFrame">{{14, 37}, {318, 13}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="936873031">
@@ -439,7 +464,7 @@
 											<object class="NSTextField" id="526155835">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 77}, {318, 17}}</string>
+												<string key="NSFrame">{{14, 80}, {318, 17}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="765798142">
@@ -455,7 +480,7 @@
 											<object class="NSPopUpButton" id="724953200">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 2}, {216, 26}}</string>
+												<string key="NSFrame">{{14, 5}, {216, 26}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="601288025">
@@ -531,7 +556,7 @@
 											<object class="NSTextField" id="590530357">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 55}, {312, 22}}</string>
+												<string key="NSFrame">{{17, 58}, {312, 22}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="922246764">
@@ -559,7 +584,7 @@
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+										<string key="NSFrame">{{10, 33}, {346, 162}}</string>
 									</object>
 									<string key="NSLabel">Advanced</string>
 									<reference key="NSColor" ref="71910056"/>
@@ -577,7 +602,7 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{392, 231}</string>
+					<string key="NSFrameSize">{392, 254}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -828,6 +853,30 @@
 					</object>
 					<int key="connectionID">73</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="606836304"/>
+						<reference key="destination" ref="279087998"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="606836304"/>
+						<reference key="destination" ref="455472712"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="606836304"/>
+							<reference key="NSDestination" ref="455472712"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -931,10 +980,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1018598123"/>
 							<reference ref="519470955"/>
-							<reference ref="526155835"/>
-							<reference ref="590530357"/>
 							<reference ref="748076392"/>
+							<reference ref="526155835"/>
 							<reference ref="724953200"/>
+							<reference ref="590530357"/>
+							<reference ref="606836304"/>
 						</object>
 						<reference key="parent" ref="1045400351"/>
 					</object>
@@ -1204,6 +1254,20 @@
 						<reference key="object" ref="595497720"/>
 						<reference key="parent" ref="519470955"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="606836304"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="100803310"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="100803310"/>
+						<reference key="parent" ref="606836304"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1214,6 +1278,7 @@
 					<string>1.IBPluginDependency</string>
 					<string>1.ImportedFromIB2</string>
 					<string>10.IBPluginDependency</string>
+					<string>10.IBViewBoundsToFrameTransform</string>
 					<string>10.ImportedFromIB2</string>
 					<string>11.IBPluginDependency</string>
 					<string>11.ImportedFromIB2</string>
@@ -1278,10 +1343,15 @@
 					<string>66.IBViewBoundsToFrameTransform</string>
 					<string>67.IBPluginDependency</string>
 					<string>69.IBPluginDependency</string>
+					<string>69.IBViewBoundsToFrameTransform</string>
 					<string>69.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
 					<string>70.IBPluginDependency</string>
+					<string>74.IBPluginDependency</string>
+					<string>74.IBViewBoundsToFrameTransform</string>
+					<string>74.ImportedFromIB2</string>
+					<string>75.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 					<string>8.IBViewBoundsToFrameTransform</string>
 					<string>8.ImportedFromIB2</string>
@@ -1295,6 +1365,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDZgAAwoIAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -1311,9 +1384,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 614}, {392, 231}}</string>
+					<string>{{88, 591}, {392, 254}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 614}, {392, 231}}</string>
+					<string>{{88, 591}, {392, 254}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{213, 107}</string>
@@ -1355,28 +1428,37 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwoYAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwrwAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCYAAAwkgAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwpoAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwwsAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCtgAAwdgAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwu4AAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAweAAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAAA/gAAAwagAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwjwAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 				</object>
@@ -1397,7 +1479,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">73</int>
+			<int key="maxID">78</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

cocoa/pe/fr.lproj/Preferences.strings

@@ -52,3 +52,6 @@
 
 /* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "70"; */
 "70.title" = "Ignorer doublons avec hardlink vers le même fichier";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "75"; */
+"75.title" = "Mode de déboguage (redémarrage requis)";

cocoa/pe/fr.lproj/Preferences.xib

@@ -38,7 +38,7 @@
 			<object class="NSWindowTemplate" id="809668081">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{92, 371}, {392, 231}}</string>
+				<string key="NSWindowRect">{{92, 348}, {392, 254}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Préférences de dupeGuru PE</string>
 				<object class="NSMutableString" key="NSWindowClass">
@@ -84,7 +84,7 @@
 						<object class="NSTabView" id="211771207">
 							<reference key="NSNextResponder" ref="905655072"/>
 							<int key="NSvFlags">12</int>
-							<string key="NSFrame">{{13, 40}, {366, 185}}</string>
+							<string key="NSFrame">{{13, 40}, {366, 208}}</string>
 							<reference key="NSSuperview" ref="905655072"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
@@ -98,7 +98,7 @@
 											<object class="NSSlider" id="266372855">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{117, 117}, {181, 21}}</string>
+												<string key="NSFrame">{{117, 140}, {181, 21}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSSliderCell" key="NSCell" id="453640282">
@@ -126,7 +126,7 @@
 											<object class="NSTextField" id="869007847">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{119, 100}, {80, 13}}</string>
+												<string key="NSFrame">{{119, 123}, {80, 13}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="106025161">
@@ -162,7 +162,7 @@
 											<object class="NSTextField" id="171701149">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">289</int>
-												<string key="NSFrame">{{216, 100}, {80, 13}}</string>
+												<string key="NSFrame">{{216, 123}, {80, 13}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="397705219">
@@ -178,7 +178,7 @@
 											<object class="NSTextField" id="638371207">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 122}, {100, 14}}</string>
+												<string key="NSFrame">{{14, 145}, {100, 14}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="812365472">
@@ -198,7 +198,7 @@
 											<object class="NSButton" id="488256664">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 56}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 79}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="401283671">
@@ -209,7 +209,7 @@
 													<reference key="NSControlView" ref="488256664"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="517313390">
+													<object class="NSCustomResource" key="NSNormalImage" id="283442644">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -225,18 +225,18 @@
 											<object class="NSButton" id="722670516">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 76}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 99}, {316, 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">Comparer les images de taille différente</string>
+													<string key="NSContents">Comparer les images de tailles différentes</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="722670516"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="517313390"/>
+													<reference key="NSNormalImage" ref="283442644"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -247,7 +247,7 @@
 											<object class="NSButton" id="472028782">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 16}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 39}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="2297113">
@@ -258,7 +258,7 @@
 													<reference key="NSControlView" ref="472028782"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="517313390"/>
+													<reference key="NSNormalImage" ref="283442644"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -269,7 +269,7 @@
 											<object class="NSButton" id="279087998">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 36}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 59}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="287383961">
@@ -280,7 +280,7 @@
 													<reference key="NSControlView" ref="279087998"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="517313390"/>
+													<reference key="NSNormalImage" ref="283442644"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -291,7 +291,7 @@
 											<object class="NSTextField" id="403531548">
 												<reference key="NSNextResponder" ref="1073354031"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{301, 122}, {31, 14}}</string>
+												<string key="NSFrame">{{301, 145}, {31, 14}}</string>
 												<reference key="NSSuperview" ref="1073354031"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="983190380">
@@ -370,7 +370,7 @@
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+										<string key="NSFrame">{{10, 33}, {346, 162}}</string>
 										<reference key="NSSuperview" ref="211771207"/>
 									</object>
 									<string key="NSLabel">Simple</string>
@@ -387,7 +387,7 @@
 											<object class="NSButton" id="1018598123">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 120}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 143}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="42276474">
@@ -398,7 +398,7 @@
 													<reference key="NSControlView" ref="1018598123"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="517313390"/>
+													<reference key="NSNormalImage" ref="283442644"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -409,7 +409,7 @@
 											<object class="NSButton" id="519470955">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{15, 100}, {316, 18}}</string>
+												<string key="NSFrame">{{15, 123}, {316, 18}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="595497720">
@@ -420,7 +420,29 @@
 													<reference key="NSControlView" ref="519470955"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="517313390"/>
+													<reference key="NSNormalImage" ref="283442644"/>
+													<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="606836304">
+												<reference key="NSNextResponder" ref="581039403"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 103}, {316, 18}}</string>
+												<reference key="NSSuperview" ref="581039403"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="100803310">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mode de déboguage (redémarrage requis)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="606836304"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="283442644"/>
 													<reference key="NSAlternateImage" ref="990345653"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -431,7 +453,7 @@
 											<object class="NSTextField" id="748076392">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 34}, {318, 13}}</string>
+												<string key="NSFrame">{{14, 37}, {318, 13}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="936873031">
@@ -447,7 +469,7 @@
 											<object class="NSTextField" id="526155835">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 77}, {318, 17}}</string>
+												<string key="NSFrame">{{14, 80}, {318, 17}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="765798142">
@@ -463,7 +485,7 @@
 											<object class="NSPopUpButton" id="724953200">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 2}, {216, 26}}</string>
+												<string key="NSFrame">{{14, 5}, {216, 26}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="601288025">
@@ -539,7 +561,7 @@
 											<object class="NSTextField" id="590530357">
 												<reference key="NSNextResponder" ref="581039403"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 55}, {312, 22}}</string>
+												<string key="NSFrame">{{17, 58}, {312, 22}}</string>
 												<reference key="NSSuperview" ref="581039403"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="922246764">
@@ -567,7 +589,7 @@
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{10, 33}, {346, 139}}</string>
+										<string key="NSFrame">{{10, 33}, {346, 162}}</string>
 									</object>
 									<string key="NSLabel">Avancé</string>
 									<reference key="NSColor" ref="71910056"/>
@@ -585,7 +607,7 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{392, 231}</string>
+					<string key="NSFrameSize">{392, 254}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
@@ -835,6 +857,30 @@
 					</object>
 					<int key="connectionID">73</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="606836304"/>
+						<reference key="destination" ref="279087998"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="606836304"/>
+						<reference key="destination" ref="455472712"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="606836304"/>
+							<reference key="NSDestination" ref="455472712"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -938,10 +984,11 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1018598123"/>
 							<reference ref="519470955"/>
-							<reference ref="526155835"/>
-							<reference ref="590530357"/>
 							<reference ref="748076392"/>
+							<reference ref="526155835"/>
 							<reference ref="724953200"/>
+							<reference ref="590530357"/>
+							<reference ref="606836304"/>
 						</object>
 						<reference key="parent" ref="1045400351"/>
 					</object>
@@ -1211,6 +1258,20 @@
 						<reference key="object" ref="595497720"/>
 						<reference key="parent" ref="519470955"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="606836304"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="100803310"/>
+						</object>
+						<reference key="parent" ref="581039403"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="100803310"/>
+						<reference key="parent" ref="606836304"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1221,6 +1282,7 @@
 					<string>1.IBPluginDependency</string>
 					<string>1.ImportedFromIB2</string>
 					<string>10.IBPluginDependency</string>
+					<string>10.IBViewBoundsToFrameTransform</string>
 					<string>10.ImportedFromIB2</string>
 					<string>11.IBPluginDependency</string>
 					<string>11.ImportedFromIB2</string>
@@ -1286,10 +1348,15 @@
 					<string>66.IBViewBoundsToFrameTransform</string>
 					<string>67.IBPluginDependency</string>
 					<string>69.IBPluginDependency</string>
+					<string>69.IBViewBoundsToFrameTransform</string>
 					<string>69.ImportedFromIB2</string>
 					<string>7.IBPluginDependency</string>
 					<string>7.ImportedFromIB2</string>
 					<string>70.IBPluginDependency</string>
+					<string>74.IBPluginDependency</string>
+					<string>74.IBViewBoundsToFrameTransform</string>
+					<string>74.ImportedFromIB2</string>
+					<string>75.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 					<string>8.IBViewBoundsToFrameTransform</string>
 					<string>8.ImportedFromIB2</string>
@@ -1303,6 +1370,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDZgAAwoIAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -1319,9 +1389,9 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 614}, {392, 231}}</string>
+					<string>{{88, 591}, {392, 254}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{88, 614}, {392, 231}}</string>
+					<string>{{88, 591}, {392, 254}}</string>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
 					<string>{1.79769e+308, 1.79769e+308}</string>
@@ -1364,28 +1434,37 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCVAAAwoYAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwrwAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCYAAAwkgAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwpoAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwwsAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCtgAAwdgAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwu4AAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAweAAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAAA/gAAAwagAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwjwAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 				</object>
@@ -1406,7 +1485,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">73</int>
+			<int key="maxID">78</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

cocoa/se/ResultWindow.m

@@ -13,15 +13,6 @@ http://www.hardcoded.net/licenses/bsd_license
 
 @implementation ResultWindow
 /* Override */
-- (id)initWithParentApp:(AppDelegateBase *)aApp;
-{
-    self = [super initWithParentApp:aApp];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndex:2];
-    [deltaColumns addIndex:4];
-    [table setDeltaColumns:deltaColumns];
-    return self;
-}
-
 - (void)initResultColumns
 {
     NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];

cocoa/se/en.lproj/Preferences.xib

@@ -34,6 +34,10 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSUserDefaultsController" id="75941798">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>DebugMode</string>
+				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
 			<object class="NSWindowTemplate" id="489014306">
@@ -641,10 +645,31 @@
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
+											<object class="NSButton" id="727223254">
+												<reference key="NSNextResponder" ref="448252432"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 174}, {313, 18}}</string>
+												<reference key="NSSuperview" ref="448252432"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="236967908">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Debug mode (restart required)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="727223254"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="589920880"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
 											<object class="NSTextField" id="962804407">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 171}, {315, 17}}</string>
+												<string key="NSFrame">{{14, 151}, {315, 17}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="111092399">
@@ -660,7 +685,7 @@
 											<object class="NSTextField" id="873032174">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 141}, {309, 22}}</string>
+												<string key="NSFrame">{{17, 121}, {309, 22}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="249250691">
@@ -677,7 +702,7 @@
 											<object class="NSTextField" id="511043844">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 120}, {315, 13}}</string>
+												<string key="NSFrame">{{14, 100}, {315, 13}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="669919489">
@@ -693,7 +718,7 @@
 											<object class="NSPopUpButton" id="857082145">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 88}, {234, 26}}</string>
+												<string key="NSFrame">{{14, 68}, {234, 26}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="307074513">
@@ -1102,6 +1127,22 @@
 					</object>
 					<int key="connectionID">144</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="727223254"/>
+						<reference key="destination" ref="75941798"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="727223254"/>
+							<reference key="NSDestination" ref="75941798"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">148</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1205,6 +1246,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="724127338"/>
 							<reference ref="647216699"/>
+							<reference ref="727223254"/>
 							<reference ref="962804407"/>
 							<reference ref="873032174"/>
 							<reference ref="511043844"/>
@@ -1601,6 +1643,20 @@
 						<reference key="object" ref="118836063"/>
 						<reference key="parent" ref="647216699"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="727223254"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="236967908"/>
+						</object>
+						<reference key="parent" ref="448252432"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="236967908"/>
+						<reference key="parent" ref="727223254"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1618,13 +1674,20 @@
 					<string>128.ImportedFromIB2</string>
 					<string>129.IBPluginDependency</string>
 					<string>133.IBPluginDependency</string>
+					<string>133.IBViewBoundsToFrameTransform</string>
 					<string>133.ImportedFromIB2</string>
 					<string>134.IBPluginDependency</string>
 					<string>138.IBPluginDependency</string>
+					<string>138.IBViewBoundsToFrameTransform</string>
 					<string>139.IBPluginDependency</string>
 					<string>141.IBPluginDependency</string>
+					<string>141.IBViewBoundsToFrameTransform</string>
 					<string>141.ImportedFromIB2</string>
 					<string>142.IBPluginDependency</string>
+					<string>145.IBPluginDependency</string>
+					<string>145.IBViewBoundsToFrameTransform</string>
+					<string>145.ImportedFromIB2</string>
+					<string>146.IBPluginDependency</string>
 					<string>51.IBPluginDependency</string>
 					<string>51.ImportedFromIB2</string>
 					<string>52.IBEditorWindowLastContentRect</string>
@@ -1653,6 +1716,7 @@
 					<string>60.IBViewBoundsToFrameTransform</string>
 					<string>60.ImportedFromIB2</string>
 					<string>61.IBPluginDependency</string>
+					<string>61.IBViewBoundsToFrameTransform</string>
 					<string>61.ImportedFromIB2</string>
 					<string>62.IBPluginDependency</string>
 					<string>62.ImportedFromIB2</string>
@@ -1728,11 +1792,26 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwyYAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAww0AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAw1IAAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw00AAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1769,10 +1848,13 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCygAAwtwAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwrgAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwt4AAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -1854,7 +1936,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">144</int>
+			<int key="maxID">148</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

cocoa/se/fr.lproj/Preferences.strings

@@ -70,3 +70,6 @@
 
 /* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "142"; */
 "142.title" = "Ignorer doublons avec hardlink vers le même fichier";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "146"; */
+"146.title" = "Mode de déboguage (redémarrage requis)";

cocoa/se/fr.lproj/Preferences.xib

@@ -290,7 +290,7 @@
 													<reference key="NSControlView" ref="637819333"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<object class="NSCustomResource" key="NSNormalImage" id="368466860">
+													<object class="NSCustomResource" key="NSNormalImage" id="587167894">
 														<string key="NSClassName">NSImage</string>
 														<string key="NSResourceName">NSSwitch</string>
 													</object>
@@ -317,7 +317,7 @@
 													<reference key="NSControlView" ref="1067721243"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -339,7 +339,7 @@
 													<reference key="NSControlView" ref="290008886"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -361,7 +361,7 @@
 													<reference key="NSControlView" ref="551239185"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -383,7 +383,7 @@
 													<reference key="NSControlView" ref="208488736"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -405,7 +405,7 @@
 													<reference key="NSControlView" ref="427690895"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -621,7 +621,7 @@
 													<reference key="NSControlView" ref="724127338"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -643,7 +643,29 @@
 													<reference key="NSControlView" ref="647216699"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSNormalImage" ref="368466860"/>
+													<reference key="NSNormalImage" ref="587167894"/>
+													<reference key="NSAlternateImage" ref="589920880"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="727223254">
+												<reference key="NSNextResponder" ref="448252432"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{15, 174}, {313, 18}}</string>
+												<reference key="NSSuperview" ref="448252432"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="236967908">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mode de déboguage (redémarrage requis)</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="727223254"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="587167894"/>
 													<reference key="NSAlternateImage" ref="589920880"/>
 													<string key="NSAlternateContents"/>
 													<string key="NSKeyEquivalent"/>
@@ -654,7 +676,7 @@
 											<object class="NSTextField" id="962804407">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 171}, {315, 17}}</string>
+												<string key="NSFrame">{{14, 151}, {315, 17}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="111092399">
@@ -670,7 +692,7 @@
 											<object class="NSTextField" id="873032174">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{17, 141}, {309, 22}}</string>
+												<string key="NSFrame">{{17, 121}, {309, 22}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="249250691">
@@ -687,7 +709,7 @@
 											<object class="NSTextField" id="511043844">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 120}, {315, 13}}</string>
+												<string key="NSFrame">{{14, 100}, {315, 13}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="669919489">
@@ -703,7 +725,7 @@
 											<object class="NSPopUpButton" id="857082145">
 												<reference key="NSNextResponder" ref="448252432"/>
 												<int key="NSvFlags">292</int>
-												<string key="NSFrame">{{14, 88}, {234, 26}}</string>
+												<string key="NSFrame">{{14, 68}, {234, 26}}</string>
 												<reference key="NSSuperview" ref="448252432"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="307074513">
@@ -1111,6 +1133,22 @@
 					</object>
 					<int key="connectionID">144</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.DebugMode</string>
+						<reference key="source" ref="727223254"/>
+						<reference key="destination" ref="75941798"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="727223254"/>
+							<reference key="NSDestination" ref="75941798"/>
+							<string key="NSLabel">value: values.DebugMode</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.DebugMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">148</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1214,6 +1252,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="724127338"/>
 							<reference ref="647216699"/>
+							<reference ref="727223254"/>
 							<reference ref="962804407"/>
 							<reference ref="873032174"/>
 							<reference ref="511043844"/>
@@ -1610,6 +1649,20 @@
 						<reference key="object" ref="118836063"/>
 						<reference key="parent" ref="647216699"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="727223254"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="236967908"/>
+						</object>
+						<reference key="parent" ref="448252432"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="236967908"/>
+						<reference key="parent" ref="727223254"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1627,13 +1680,20 @@
 					<string>128.ImportedFromIB2</string>
 					<string>129.IBPluginDependency</string>
 					<string>133.IBPluginDependency</string>
+					<string>133.IBViewBoundsToFrameTransform</string>
 					<string>133.ImportedFromIB2</string>
 					<string>134.IBPluginDependency</string>
 					<string>138.IBPluginDependency</string>
+					<string>138.IBViewBoundsToFrameTransform</string>
 					<string>139.IBPluginDependency</string>
 					<string>141.IBPluginDependency</string>
+					<string>141.IBViewBoundsToFrameTransform</string>
 					<string>141.ImportedFromIB2</string>
 					<string>142.IBPluginDependency</string>
+					<string>145.IBPluginDependency</string>
+					<string>145.IBViewBoundsToFrameTransform</string>
+					<string>145.ImportedFromIB2</string>
+					<string>146.IBPluginDependency</string>
 					<string>51.IBPluginDependency</string>
 					<string>51.ImportedFromIB2</string>
 					<string>52.IBEditorWindowLastContentRect</string>
@@ -1663,6 +1723,7 @@
 					<string>60.IBViewBoundsToFrameTransform</string>
 					<string>60.ImportedFromIB2</string>
 					<string>61.IBPluginDependency</string>
+					<string>61.IBViewBoundsToFrameTransform</string>
 					<string>61.ImportedFromIB2</string>
 					<string>62.IBPluginDependency</string>
 					<string>62.ImportedFromIB2</string>
@@ -1738,11 +1799,26 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwyYAAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAww0AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAw1IAAA</bytes>
+					</object>
+					<boolean value="YES"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw00AAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1780,10 +1856,13 @@
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCygAAwtwAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwrgAAA</bytes>
 					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwt4AAA</bytes>
+					</object>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="YES"/>
@@ -1865,7 +1944,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">144</int>
+			<int key="maxID">148</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

core/app.py

@@ -30,12 +30,16 @@ JOB_COPY = 'job_copy'
 JOB_DELETE = 'job_delete'
 
 HAD_FIRST_LAUNCH_PREFERENCE = 'HadFirstLaunch'
+DEBUG_MODE_PREFERENCE = 'DebugMode'
 
 class NoScannableFileError(Exception):
     pass
 
 class DupeGuru(RegistrableApplication, Broadcaster):
     def __init__(self, data_module, appdata):
+        if self.get_default(DEBUG_MODE_PREFERENCE, False):
+            logging.getLogger().setLevel(logging.DEBUG)
+            logging.debug("Debug mode enabled")
         RegistrableApplication.__init__(self, appid=1)
         Broadcaster.__init__(self)
         self.is_first_run = not self.get_default(HAD_FIRST_LAUNCH_PREFERENCE, False)
@@ -94,12 +98,17 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         except EnvironmentError:
             return None
     
+    def _results_changed(self):
+        self.selected_dupes = [d for d in self.selected_dupes
+            if self.results.get_group_of_duplicate(d) is not None]
+        self.notify('results_changed')
+    
     def _job_completed(self, jobid):
         # Must be called by subclasses when they detect that an async job is completed.
         if jobid == JOB_SCAN:
-            self.notify('results_changed')
+            self._results_changed()
         elif jobid in (JOB_LOAD, JOB_MOVE, JOB_DELETE):
-            self.notify('results_changed')
+            self._results_changed()
             self.notify('problems_changed')
     
     @staticmethod
@@ -167,7 +176,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
             filter = escape(filter, set('()[]\\.|+?^'))
             filter = escape(filter, '*', '.')
         self.results.apply_filter(filter)
-        self.notify('results_changed')
+        self._results_changed()
     
     def clean_empty_dirs(self, path):
         if self.options['clean_empty_dirs']:
@@ -217,7 +226,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         column_ids = [colid for colid in column_ids if colid.isdigit()]
         column_ids = list(map(int, column_ids))
         column_ids.sort()
-        colnames = [col['display'] for i, col in enumerate(self.data.COLUMNS) if i in column_ids]
+        colnames = [col.display for i, col in enumerate(self.data.COLUMNS) if i in column_ids]
         rows = []
         for group in self.results.groups:
             for dupe in group:
@@ -312,7 +321,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
     
     def remove_marked(self):
         self.results.perform_on_marked(lambda x:None, True)
-        self.notify('results_changed')
+        self._results_changed()
     
     def remove_selected(self):
         self.remove_duplicates(self.selected_dupes)
@@ -352,7 +361,7 @@ class DupeGuru(RegistrableApplication, Broadcaster):
         if not self.directories.has_any_file():
             raise NoScannableFileError()
         self.results.groups = []
-        self.notify('results_changed')
+        self._results_changed()
         self._start_job(JOB_SCAN, do)
     
     def toggle_selected_mark_state(self):

core/app_cocoa.py

@@ -29,9 +29,7 @@ JOBID2TITLE = {
 
 class DupeGuru(app.DupeGuru):
     def __init__(self, data_module, appdata_subdir):
-        LOGGING_LEVEL = logging.DEBUG if self.get_default('debug') else logging.WARNING
+        logging.basicConfig(level=logging.WARNING, format='%(levelname)s %(message)s')
-        logging.basicConfig(level=LOGGING_LEVEL, format='%(levelname)s %(message)s')
-        logging.debug('started in debug mode')
         install_exception_hook()
         appsupport = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, True)[0]
         appdata = op.join(appsupport, appdata_subdir)

core/app_cocoa_inter.py

@@ -112,6 +112,9 @@ class PyDupeGuruBase(PyFairware):
     def resultsAreModified(self):
         return self.py.results.is_modified
     
+    def deltaColumns(self):
+        return list(self.py.data.DELTA_COLUMNS)
+    
     #---Properties
     @signature('v@:c')
     def setMixFileKind_(self, mix_file_kind):

core/data.py

@@ -6,10 +6,14 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
+from collections import namedtuple
+
 from hscommon.util import format_time_decimal, format_size
 
 import time
 
+Column = namedtuple('Column', 'attr display')
+
 def format_path(p):
     return str(p[:-1])
 

core/directories.py

@@ -7,6 +7,7 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from xml.etree import ElementTree as ET
+import logging
 
 from hscommon import io
 from hscommon.path import Path
@@ -24,7 +25,7 @@ class AlreadyThereError(Exception):
 class InvalidPathError(Exception):
     """The path being added is invalid"""
 
-class Directories(object):
+class Directories:
     #---Override
     def __init__(self, fileclasses=[fs.File]):
         self._dirs = []
@@ -63,7 +64,9 @@ class Directories(object):
         try:
             filepaths = set()
             if state != STATE_EXCLUDED:
-                for file in fs.get_files(from_path, fileclasses=self.fileclasses):
+                found_files = fs.get_files(from_path, fileclasses=self.fileclasses)
+                logging.debug("Collected {} files in folder {}".format(len(found_files), str(from_path)))
+                for file in found_files:
                     file.is_ref = state == STATE_REFERENCE
                     filepaths.add(file.path)
                     yield file

core/gui/details_panel.py

@@ -31,7 +31,7 @@ class DetailsPanel(GUIObject):
         # we don't want the two sides of the table to display the stats for the same file
         ref = group.ref if group is not None and group.ref is not dupe else None
         l2 = self.app._get_display_info(ref, group, False)
-        names = [c['display'] for c in self.app.data.COLUMNS]
+        names = [c.display for c in self.app.data.COLUMNS]
         self._table = list(zip(names, l1, l2))
     
     #--- Public

core/results.py

@@ -259,11 +259,14 @@ class Results(Markable):
             group = self.get_group_of_duplicate(dupe)
             if dupe not in group.dupes:
                 return
+            ref = group.ref
             group.remove_dupe(dupe, False)
+            del self.__group_of_duplicate[dupe]
             self._remove_mark_flag(dupe)
             self.__total_count -= 1
             self.__total_size -= dupe.size
             if not group:
+                del self.__group_of_duplicate[ref]
                 self.__groups.remove(group)
                 if self.__filtered_groups:
                     self.__filtered_groups.remove(group)
@@ -272,7 +275,7 @@ class Results(Markable):
         for group in affected_groups:
             group.discard_matches()
         self.__dupes = None
-        self.is_modified = True
+        self.is_modified = bool(self.__groups)
     
     def save_to_xml(self, outfile):
         self.apply_filter(None)

core/scanner.py

@@ -66,6 +66,7 @@ class Scanner:
                 ScanType.Tag: lambda f: [engine.getwords(str(getattr(f, attrname))) for attrname in SCANNABLE_TAGS if attrname in self.scanned_tags],
             }[self.scan_type]
             for f in j.iter_with_progress(files, tr("Read metadata of %d/%d files")):
+                logging.debug("Reading metadata of {}".format(str(f.path)))
                 f.words = func(f)
             return engine.getmatches(files, j=j, **kw)
     

core/tests/app_test.py

@@ -39,6 +39,12 @@ class DupeGuru(DupeGuruBase):
         except JobCancelled:
             return
     
+    def _get_default(self, key_name):
+        return None
+    
+    def _set_default(self, key_name, value):
+        pass
+    
 
 def add_fake_files_to_directories(directories, files):
     directories.get_files = lambda: iter(files)
@@ -384,6 +390,16 @@ class TestCaseDupeGuruWithResults:
         add_fake_files_to_directories(app.directories, self.objects) # We want the scan to at least start
         app.start_scanning() # will be cancelled immediately
         eq_(len(self.rtable), 0)
+    
+    def test_selected_dupes_after_removal(self, do_setup):
+        # Purge the app's `selected_dupes` attribute when removing dupes, or else it might cause a
+        # crash later with None refs.
+        app = self.app
+        app.results.mark_all()
+        self.rtable.select([0, 1, 2, 3, 4])
+        app.remove_marked()
+        eq_(len(self.rtable), 0)
+        eq_(app.selected_dupes, [])
 
 class TestCaseDupeGuru_renameSelected:
     def pytest_funcarg__do_setup(self, request):

core/tests/data.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2009-10-23
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
@@ -10,16 +9,17 @@
 # data module for tests
 
 from hscommon.util import format_size
-from ..data import format_path, cmp_value
+from ..data import format_path, cmp_value, Column
 
 COLUMNS = [
-    {'attr':'name','display':'Filename'},
+    Column('name', 'Filename'),
-    {'attr':'path','display':'Directory'},
+    Column('path', 'Directory'),
-    {'attr':'size','display':'Size (KB)'},
+    Column('size', 'Size (KB)'),
-    {'attr':'extension','display':'Kind'},
+    Column('extension', 'Kind'),
 ]
 
 METADATA_TO_READ = ['size']
+DELTA_COLUMNS = {2,}
 
 def GetDisplayInfo(dupe, group, delta):
     size = dupe.size
@@ -35,10 +35,10 @@ def GetDisplayInfo(dupe, group, delta):
     ]
 
 def GetDupeSortKey(dupe, get_group, key, delta):
-    r = cmp_value(getattr(dupe, COLUMNS[key]['attr']))
+    r = cmp_value(getattr(dupe, COLUMNS[key].attr))
-    if delta and (key == 2):
+    if delta and (key in DELTA_COLUMNS):
-        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr']))
+        r -= cmp_value(getattr(get_group().ref, COLUMNS[key].attr))
     return r
 
 def GetGroupSortKey(group, key):
-    return cmp_value(getattr(group.ref, COLUMNS[key]['attr']))
+    return cmp_value(getattr(group.ref, COLUMNS[key].attr))

core/tests/results_test.py

@@ -225,6 +225,21 @@ class TestCaseResultsWithSomeGroups:
         self.results.load_from_xml(f, get_file)
         assert not self.results.is_modified
     
+    def test_is_modified_after_removing_all_results(self):
+        # Removing all results sets the is_modified flag to false.
+        self.results.mark_all()
+        self.results.perform_on_marked(lambda x:None, True)
+        assert not self.results.is_modified
+    
+    def test_group_of_duplicate_after_removal(self):
+        # removing a duplicate also removes it from the dupe:group map.
+        dupe = self.results.groups[1].dupes[0]
+        ref = self.results.groups[1].ref
+        self.results.remove_duplicates([dupe])
+        assert self.results.get_group_of_duplicate(dupe) is None
+        # also remove group ref
+        assert self.results.get_group_of_duplicate(ref) is None
+    
 
 class TestCaseResultsWithSavedResults:
     def setup_method(self, method):

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '5.10.4'
+__version__ = '6.0.0'
 __appname__ = 'dupeGuru Music Edition'

core_me/data.py

@@ -7,32 +7,36 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from hscommon.util import format_time, format_size
+from hscommon.trans import tr as trbase
 from core.data import (format_path, format_timestamp, format_words, format_perc, 
-    format_dupe_count, cmp_value)
+    format_dupe_count, cmp_value, Column)
+
+tr = lambda s: trbase(s, 'columns')
 
 COLUMNS = [
-    {'attr':'name','display':'Filename'},
+    Column('name', tr("Filename")),
-    {'attr':'path','display':'Directory'},
+    Column('path', tr("Folder")),
-    {'attr':'size','display':'Size (MB)'},
+    Column('size', tr("Size (MB)")),
-    {'attr':'duration','display':'Time'},
+    Column('duration', tr("Time")),
-    {'attr':'bitrate','display':'Bitrate'},
+    Column('bitrate', tr("Bitrate")),
-    {'attr':'samplerate','display':'Sample Rate'},
+    Column('samplerate', tr("Sample Rate")),
-    {'attr':'extension','display':'Kind'},
+    Column('extension', tr("Kind")),
-    {'attr':'mtime','display':'Modification'},
+    Column('mtime', tr("Modification")),
-    {'attr':'title','display':'Title'},
+    Column('title', tr("Title")),
-    {'attr':'artist','display':'Artist'},
+    Column('artist', tr("Artist")),
-    {'attr':'album','display':'Album'},
+    Column('album', tr("Album")),
-    {'attr':'genre','display':'Genre'},
+    Column('genre', tr("Genre")),
-    {'attr':'year','display':'Year'},
+    Column('year', tr("Year")),
-    {'attr':'track','display':'Track Number'},
+    Column('track', tr("Track Number")),
-    {'attr':'comment','display':'Comment'},
+    Column('comment', tr("Comment")),
-    {'attr':'percentage','display':'Match %'},
+    Column('percentage', tr("Match %")),
-    {'attr':'words','display':'Words Used'},
+    Column('words', tr("Words Used")),
-    {'attr':'dupe_count','display':'Dupe Count'},
+    Column('dupe_count', tr("Dupe Count")),
 ]
 
 MATCHPERC_COL = 15
 DUPECOUNT_COL = 17
+DELTA_COLUMNS = {2, 3, 4, 5, 7}
 
 METADATA_TO_READ = ['size', 'mtime', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
     'album', 'genre', 'year', 'track', 'comment']
@@ -84,9 +88,9 @@ def GetDupeSortKey(dupe, get_group, key, delta):
         return m.percentage
     if key == DUPECOUNT_COL:
         return 0
-    r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
+    r = cmp_value(getattr(dupe, COLUMNS[key].attr, ''))
-    if delta and (key in {2, 3, 4, 7}):
+    if delta and (key in DELTA_COLUMNS):
-        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
+        r -= cmp_value(getattr(get_group().ref, COLUMNS[key].attr, ''))
     return r
 
 def GetGroupSortKey(group, key):
@@ -94,4 +98,4 @@ def GetGroupSortKey(group, key):
         return group.percentage
     if key == DUPECOUNT_COL:
         return len(group)
-    return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))
+    return cmp_value(getattr(group.ref, COLUMNS[key].attr, ''))

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '1.11.3'
+__version__ = '2.0.0'
 __appname__ = 'dupeGuru Picture Edition'

core_pe/app_cocoa.py

@@ -11,12 +11,11 @@ import plistlib
 import logging
 import re
 
-from appscript import app, k, CommandError, ApplicationNotFoundError
+from appscript import app, its, CommandError, ApplicationNotFoundError
 
 from hscommon import io
 from hscommon.util import get_file_ext, remove_invalid_xml
 from hscommon.path import Path
-from hscommon.cocoa import as_fetch
 from hscommon.cocoa.objcmin import NSUserDefaults, NSURL
 from hscommon.trans import tr
 
@@ -151,37 +150,28 @@ class DupeGuruPE(app_cocoa.DupeGuru):
             return self._do_delete_dupe(dupe, replace_with_hardlinks)
         
         marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
-        self.path2iphoto = {}
+        j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
         if any(isinstance(dupe, IPhoto) for dupe in marked):
-            j = j.start_subjob([6, 4], tr("Probing iPhoto. Don't touch it during the operation!"))
+            j.add_progress(0, desc=tr("Talking to iPhoto. Don't touch it!"))
             try:
                 a = app('iPhoto')
                 a.activate(timeout=0)
                 a.select(a.photo_library_album(timeout=0), timeout=0)
-                photos = as_fetch(a.photo_library_album().photos, k.item)
-                for photo in j.iter_with_progress(photos):
-                    try:
-                        self.path2iphoto[str(photo.image_path(timeout=0))] = photo
-                    except CommandError:
-                        pass
             except (CommandError, RuntimeError, ApplicationNotFoundError):
                 pass
-        j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
         self.results.perform_on_marked(op, True)
-        del self.path2iphoto
     
     def _do_delete_dupe(self, dupe, replace_with_hardlinks):
         if isinstance(dupe, IPhoto):
-            if str(dupe.path) in self.path2iphoto:
+            try:
-                photo = self.path2iphoto[str(dupe.path)]
+                a = app('iPhoto')
-                try:
+                [photo] = a.photo_library_album().photos[its.image_path == str(dupe.path)]()
-                    a = app('iPhoto')
+                a.remove(photo, timeout=0)
-                    a.remove(photo, timeout=0)
+            except ValueError:
-                except (CommandError, RuntimeError) as e:
+                msg = "Could not find photo '{}' in iPhoto Library".format(str(dupe.path))
-                    raise EnvironmentError(str(e))
-            else:
-                msg = "Could not find photo %s in iPhoto Library" % str(dupe.path)
                 raise EnvironmentError(msg)
+            except (CommandError, RuntimeError) as e:
+                raise EnvironmentError(str(e))
         else:
             app_cocoa.DupeGuru._do_delete_dupe(self, dupe, replace_with_hardlinks)
     

core_pe/cache.py

@@ -81,9 +81,9 @@ class Cache(object):
         try:
             self.con.execute(sql, [value, key])
         except sqlite.OperationalError:
-            logging.warning('Picture cache could not set %r for key %r', value, key)
+            logging.warning('Picture cache could not set value for key %r', key)
         except sqlite.DatabaseError as e:
-            logging.warning('DatabaseError while setting %r for key %r: %s', value, key, str(e))
+            logging.warning('DatabaseError while setting value for key %r: %s', key, str(e))
     
     def _create_con(self, second_try=False):
         def create_tables():

core_pe/data.py

@@ -7,32 +7,40 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from hscommon.util import format_size
-from core.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value
+from hscommon.trans import tr as trbase
+from core.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value, Column
+
+tr = lambda s: trbase(s, 'columns')
 
 def format_dimensions(dimensions):
     return '%d x %d' % (dimensions[0], dimensions[1])
 
 COLUMNS = [
-    {'attr':'name','display':'Filename'},
+    Column('name', tr("Filename")),
-    {'attr':'path','display':'Directory'},
+    Column('path', tr("Folder")),
-    {'attr':'size','display':'Size (KB)'},
+    Column('size', tr("Size (KB)")),
-    {'attr':'extension','display':'Kind'},
+    Column('extension', tr("Kind")),
-    {'attr':'dimensions','display':'Dimensions'},
+    Column('dimensions', tr("Dimensions")),
-    {'attr':'mtime','display':'Modification'},
+    Column('mtime', tr("Modification")),
-    {'attr':'percentage','display':'Match %'},
+    Column('percentage', tr("Match %")),
-    {'attr':'dupe_count','display':'Dupe Count'},
+    Column('dupe_count', tr("Dupe Count")),
 ]
 
 MATCHPERC_COL = 6
 DUPECOUNT_COL = 7
+DELTA_COLUMNS = {2, 4, 5}
 
 METADATA_TO_READ = ['size', 'mtime', 'dimensions']
 
+def get_delta_dimensions(value, ref_value):
+    return (value[0]-ref_value[0], value[1]-ref_value[1])
+
 def GetDisplayInfo(dupe,group,delta=False):
     if (dupe is None) or (group is None):
         return ['---'] * len(COLUMNS)
     size = dupe.size
     mtime = dupe.mtime
+    dimensions = dupe.dimensions
     m = group.get_match_of(dupe)
     if m:
         percentage = m.percentage
@@ -41,6 +49,7 @@ def GetDisplayInfo(dupe,group,delta=False):
             r = group.ref
             size -= r.size
             mtime -= r.mtime
+            dimensions = get_delta_dimensions(dimensions, r.dimensions)
     else:
         percentage = group.percentage
         dupe_count = len(group.dupes)
@@ -50,7 +59,7 @@ def GetDisplayInfo(dupe,group,delta=False):
         format_path(dupe_path),
         format_size(size, 0, 1, False),
         dupe.extension,
-        format_dimensions(dupe.dimensions),
+        format_dimensions(dimensions),
         format_timestamp(mtime, delta and m),
         format_perc(percentage),
         format_dupe_count(dupe_count)
@@ -62,9 +71,13 @@ def GetDupeSortKey(dupe, get_group, key, delta):
         return m.percentage
     if key == DUPECOUNT_COL:
         return 0
-    r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
+    r = cmp_value(getattr(dupe, COLUMNS[key].attr, ''))
-    if delta and (key in {2, 5}):
+    if delta and (key in DELTA_COLUMNS):
-        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
+        ref_value = cmp_value(getattr(get_group().ref, COLUMNS[key].attr, ''))
+        if key == 4: # dimensions
+            r = get_delta_dimensions(r, ref_value)
+        else:
+            r -= ref_value
     return r
 
 def GetGroupSortKey(group, key):
@@ -72,5 +85,5 @@ def GetGroupSortKey(group, key):
         return group.percentage
     if key == DUPECOUNT_COL:
         return len(group)
-    return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))
+    return cmp_value(getattr(group.ref, COLUMNS[key].attr, ''))
 

core_pe/matchbase.py

@@ -34,8 +34,9 @@ def prepare_pictures(pictures, cache_path, j=job.nulljob):
     prepared = [] # only pictures for which there was no error getting blocks
     try:
         for picture in j.iter_with_progress(pictures, tr("Analyzed %d/%d pictures")):
-            picture.dimensions
             picture.unicode_path = str(picture.path)
+            logging.debug("Analyzing picture at {}".format(picture.unicode_path))
+            picture.dimensions # pre-read dimensions
             try:
                 if picture.unicode_path not in cache:
                     blocks = picture.get_blocks(BLOCK_COUNT_PER_SIDE)

core_se/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.0.0'
+__version__ = '3.0.1'
 __appname__ = 'dupeGuru'

core_se/data.py

@@ -7,22 +7,26 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from hscommon.util import format_size
+from hscommon.trans import tr as trbase
 from core.data import (format_path, format_timestamp, format_words, format_perc, 
-    format_dupe_count, cmp_value)
+    format_dupe_count, cmp_value, Column)
+
+tr = lambda s: trbase(s, 'columns')
 
 COLUMNS = [
-    {'attr':'name','display':'Filename'},
+    Column('name', tr("Filename")),
-    {'attr':'path','display':'Directory'},
+    Column('path', tr("Folder")),
-    {'attr':'size','display':'Size (KB)'},
+    Column('size', tr("Size (KB)")),
-    {'attr':'extension','display':'Kind'},
+    Column('extension', tr("Kind")),
-    {'attr':'mtime','display':'Modification'},
+    Column('mtime', tr("Modification")),
-    {'attr':'percentage','display':'Match %'},
+    Column('percentage', tr("Match %")),
-    {'attr':'words','display':'Words Used'},
+    Column('words', tr("Words Used")),
-    {'attr':'dupe_count','display':'Dupe Count'},
+    Column('dupe_count', tr("Dupe Count")),
 ]
 
 MATCHPERC_COL = 5
 DUPECOUNT_COL = 7
+DELTA_COLUMNS = {2, 4}
 
 METADATA_TO_READ = ['size', 'mtime']
 
@@ -57,9 +61,9 @@ def GetDupeSortKey(dupe, get_group, key, delta):
         return m.percentage
     if key == DUPECOUNT_COL:
         return 0
-    r = cmp_value(getattr(dupe, COLUMNS[key]['attr'], ''))
+    r = cmp_value(getattr(dupe, COLUMNS[key].attr, ''))
-    if delta and (key in {2, 4}):
+    if delta and (key in DELTA_COLUMNS):
-        r -= cmp_value(getattr(get_group().ref, COLUMNS[key]['attr'], ''))
+        r -= cmp_value(getattr(get_group().ref, COLUMNS[key].attr, ''))
     return r
 
 def GetGroupSortKey(group, key):
@@ -67,4 +71,4 @@ def GetGroupSortKey(group, key):
         return group.percentage
     if key == DUPECOUNT_COL:
         return len(group)
-    return cmp_value(getattr(group.ref, COLUMNS[key]['attr'], ''))
+    return cmp_value(getattr(group.ref, COLUMNS[key].attr, ''))

help/changelog_me

@@ -1,3 +1,13 @@
+=== 6.0.0 (2011-02-01)
+
+* Re-designed the UI. (#129)
+* Internationalized dupeGuru and localized it to french. (#32)
+* Changed the format of the help file. (#130)
+* Fixed crashes when reading malformed songs. (#127 #131)
+* Removed focus from the cancel button in the progress dialog to avoid accidental cancellations. [Mac OS X] (#135)
+* Folders added through drag and drop are added to the recent folders list. (#136)
+* Added a debugging mode. (#132)
+
 === 5.10.4 (2010-12-30)
 
 * Fixed bug causing results to be corrupted after a scan cancellation. (#120)

help/changelog_pe

@@ -1,3 +1,13 @@
+=== 2.0.0 (2011-01-29)
+
+* Re-designed the UI. (#129)
+* Internationalized dupeGuru and localized it to french. (#32)
+* Changed the format of the help file. (#130)
+* The "Dimensions" column is now affected by the delta mode. (#115)
+* Removed focus from the cancel button in the progress dialog to avoid accidental cancellations. [Mac OS X] (#135)
+* Folders added through drag and drop are added to the recent folders list. (#136)
+* Added a debugging mode. (#132)
+
 === 1.11.3 (2010-12-31)
 
 * Fixed bug causing results to be corrupted after a scan cancellation. (#120)

help/changelog_se

@@ -1,3 +1,12 @@
+=== 3.0.1 (2011-01-27)
+
+* Restored the context menu which had been broken in 3.0.0. [Mac OS X] (#133)
+* Fixed a bug where an "unsaved results" warning would be issued on quit even with empty results. (#134)
+* Removed focus from the cancel button in the progress dialog to avoid accidental cancellations. [Mac OS X] (#135)
+* Folders added through drag and drop are added to the recent folders list. (#136)
+* Added a debugging mode. (#132)
+* Fixed french localization glitches.
+
 === 3.0.0 (2011-01-24)
 
 * Re-designed the UI. (#129)

qt/base/app.py

@@ -10,6 +10,7 @@ import sys
 import logging
 import os
 import os.path as op
+import io
 
 from PyQt4.QtCore import QTimer, QObject, QCoreApplication, QUrl, QProcess, SIGNAL, pyqtSignal
 from PyQt4.QtGui import QDesktopServices, QFileDialog, QDialog, QMessageBox, QApplication
@@ -38,17 +39,26 @@ JOBID2TITLE = {
     JOB_DELETE: tr("Sending files to the recycle bin"),
 }
 
+class SysWrapper(io.IOBase):
+    def write(self, s):
+        if s.strip(): # don't log empty stuff
+            logging.warning(s)
+
 class DupeGuru(DupeGuruBase, QObject):
     LOGO_NAME = '<replace this>'
     NAME = '<replace this>'
-    DELTA_COLUMNS = frozenset()
     
     def __init__(self, data_module):
         appdata = str(QDesktopServices.storageLocation(QDesktopServices.DataLocation))
         if not op.exists(appdata):
             os.makedirs(appdata)
         # For basicConfig() to work, we have to be sure that no logging has taken place before this call.
-        logging.basicConfig(filename=op.join(appdata, 'debug.log'), level=logging.WARNING)
+        logging.basicConfig(filename=op.join(appdata, 'debug.log'), level=logging.WARNING,
+            format='%(asctime)s - %(levelname)s - %(message)s')
+        if sys.stderr is None: # happens under a cx_freeze environment
+            sys.stderr = SysWrapper()
+        if sys.stdout is None:
+            sys.stdout = SysWrapper()
         self.prefs = self._create_preferences()
         self.prefs.load()
         DupeGuruBase.__init__(self, data_module, appdata)

qt/base/directories_dialog.py

@@ -13,6 +13,7 @@ from PyQt4.QtGui import (QWidget, QFileDialog, QHeaderView, QVBoxLayout, QHBoxLa
 
 from hscommon.trans import tr, trmsg
 from qtlib.recent import Recent
+from qtlib.util import moveToScreenCenter
 from core.app import NoScannableFileError
 
 from . import platform
@@ -45,6 +46,7 @@ class DirectoriesDialog(QMainWindow):
         self.app.recentResults.itemsChanged.connect(self._updateLoadResultsButton)
         self.recentFolders.itemsChanged.connect(self._updateAddButton)
         self.recentFolders.mustOpenItem.connect(self.app.add_directory)
+        self.directoriesModel.foldersAdded.connect(self.directoriesModelAddedFolders)
         self.app.willSavePrefs.connect(self.appWillSavePrefs)
         
     def _setupActions(self):
@@ -143,6 +145,8 @@ class DirectoriesDialog(QMainWindow):
         
         if self.app.prefs.directoriesWindowRect is not None:
             self.setGeometry(self.app.prefs.directoriesWindowRect)
+        else:
+            moveToScreenCenter(self)
     
     def _updateAddButton(self):
         if self.recentFolders.isEmpty():
@@ -188,6 +192,10 @@ class DirectoriesDialog(QMainWindow):
     def appWillSavePrefs(self):
         self.app.prefs.directoriesWindowRect = self.geometry()
     
+    def directoriesModelAddedFolders(self, folders):
+        for folder in folders:
+            self.recentFolders.insertItem(folder)
+    
     def loadResultsTriggered(self):
         title = trmsg("SelectResultToLoadMsg")
         files = tr("dupeGuru Results (*.dupeguru)")

qt/base/directories_model.py

@@ -8,7 +8,7 @@
 
 import urllib.parse
 
-from PyQt4.QtCore import QModelIndex, Qt, QRect, QEvent, QPoint, QUrl
+from PyQt4.QtCore import pyqtSignal, Qt, QRect, QEvent, QPoint, QUrl
 from PyQt4.QtGui import (QComboBox, QStyledItemDelegate, QMouseEvent, QApplication, QBrush, QStyle,
     QStyleOptionComboBox, QStyleOptionViewItemV4)
 
@@ -107,6 +107,7 @@ class DirectoriesModel(TreeModel):
         paths = [str(QUrl(url).toLocalFile()) for url in urls if url]
         for path in paths:
             self.model.add_directory(path)
+        self.foldersAdded.emit(paths)
         self.reset()
         return True
     
@@ -140,6 +141,8 @@ class DirectoriesModel(TreeModel):
         # work with ActionMove either. So screw that, and accept anything.
         return Qt.ActionMask
     
+    #--- Signals
+    foldersAdded = pyqtSignal(list)
     #--- model --> view
     def refresh(self):
         self.reset()

qt/base/preferences.py

@@ -27,6 +27,7 @@ class Preferences(PreferencesBase):
         self.ignore_hardlink_matches = get('IgnoreHardlinkMatches', self.ignore_hardlink_matches)
         self.use_regexp = get('UseRegexp', self.use_regexp)
         self.remove_empty_folders = get('RemoveEmptyFolders', self.remove_empty_folders)
+        self.debug_mode = get('DebugMode', self.debug_mode)
         self.destination_type = get('DestinationType', self.destination_type)
         self.custom_command = get('CustomCommand', self.custom_command)
         self.language = get('Language', self.language)
@@ -59,6 +60,7 @@ class Preferences(PreferencesBase):
         self.use_regexp = False
         self.ignore_hardlink_matches = False
         self.remove_empty_folders = False
+        self.debug_mode = False
         self.destination_type = 1
         self.custom_command = ''
         self.language = ''
@@ -89,6 +91,7 @@ class Preferences(PreferencesBase):
         set_('IgnoreHardlinkMatches', self.ignore_hardlink_matches)
         set_('UseRegexp', self.use_regexp)
         set_('RemoveEmptyFolders', self.remove_empty_folders)
+        set_('DebugMode', self.debug_mode)
         set_('DestinationType', self.destination_type)
         set_('CustomCommand', self.custom_command)
         set_('ColumnsWidth', self.columns_width)

qt/base/preferences_dialog.py

@@ -131,6 +131,7 @@ class PreferencesDialogBase(QDialog):
         setchecked(self.useRegexpBox, prefs.use_regexp)
         setchecked(self.removeEmptyFoldersBox, prefs.remove_empty_folders)
         setchecked(self.ignoreHardlinkMatches, prefs.ignore_hardlink_matches)
+        setchecked(self.debugModeBox, prefs.debug_mode)
         self.copyMoveDestinationComboBox.setCurrentIndex(prefs.destination_type)
         self.customCommandEdit.setText(prefs.custom_command)
         langindex = {'fr': 1}.get(self.app.prefs.language, 0)
@@ -145,6 +146,7 @@ class PreferencesDialogBase(QDialog):
         prefs.use_regexp = ischecked(self.useRegexpBox)
         prefs.remove_empty_folders = ischecked(self.removeEmptyFoldersBox)
         prefs.ignore_hardlink_matches = ischecked(self.ignoreHardlinkMatches)
+        prefs.debug_mode = ischecked(self.debugModeBox)
         prefs.destination_type = self.copyMoveDestinationComboBox.currentIndex()
         prefs.custom_command = str(self.customCommandEdit.text())
         langs = ['en', 'fr']

qt/base/result_window.py

@@ -15,6 +15,7 @@ from PyQt4.QtGui import (QMainWindow, QMenu, QLabel, QHeaderView, QMessageBox, Q
 
 from hscommon.trans import tr, trmsg
 from hscommon.util import nonone
+from qtlib.util import moveToScreenCenter
 
 from .results_model import ResultsModel, ResultsView
 from .stats_label import StatsLabel
@@ -137,7 +138,7 @@ class ResultWindow(QMainWindow):
         menu = self.menuColumns
         self._column_actions = []
         for index, column in enumerate(self.app.data.COLUMNS):
-            action = menu.addAction(column['display'])
+            action = menu.addAction(column.display)
             action.setCheckable(True)
             action.column_index = index
             self._column_actions.append(action)
@@ -192,8 +193,11 @@ class ResultWindow(QMainWindow):
         
         if self.app.prefs.resultWindowIsMaximized:
             self.setWindowState(self.windowState() | Qt.WindowMaximized)
-        if self.app.prefs.resultWindowRect is not None and not self.app.prefs.resultWindowIsMaximized:
+        else:
-            self.setGeometry(self.app.prefs.resultWindowRect)
+            if self.app.prefs.resultWindowRect is not None:
+                self.setGeometry(self.app.prefs.resultWindowRect)
+            else:
+                moveToScreenCenter(self)
     
     #--- Private
     def _load_columns(self):

qt/base/results_model.py

@@ -18,7 +18,7 @@ class ResultsModel(Table):
         model = ResultTableModel(self, app)
         self._app = app
         self._data = app.data
-        self._delta_columns = app.DELTA_COLUMNS
+        self._delta_columns = app.data.DELTA_COLUMNS
         Table.__init__(self, model, view)
         self.model.connect()
     
@@ -63,7 +63,7 @@ class ResultsModel(Table):
     
     def headerData(self, section, orientation, role):
         if orientation == Qt.Horizontal and role == Qt.DisplayRole and section < len(self._data.COLUMNS):
-            return self._data.COLUMNS[section]['display']
+            return self._data.COLUMNS[section].display
         return None
     
     def setData(self, index, value, role):

qt/lang/fr.ts

@@ -244,7 +244,7 @@
 </message>
 <message>
     <source>Excluded</source>
-    <translation>Exclus</translation>
+    <translation>Exclu</translation>
 </message>
 <message>
     <source>Problems!</source>
@@ -390,6 +390,8 @@
     <source>Delete and hardlink duplicates</source>
     <translation>Hardlinking de doublons</translation>
 </message>
+
+<!--- Preferences dialog -->
 <message>
     <source>Scan Type:</source>
     <translation>Type de scan:</translation>
@@ -534,6 +536,97 @@
     <source>French</source>
     <translation>Français</translation>
 </message>
+<message>
+    <source>Debug mode (restart required)</source>
+    <translation>Mode de déboguage (redémarrage requis)</translation>
+</message>
+</context>
+
+<!-- ******** Columns ******** -->
+<context>
+<name>columns</name>
+<message>
+    <source>Filename</source>
+    <translation>Nom de fichier</translation>
+</message>
+<message>
+    <source>Folder</source>
+    <translation>Dossier</translation>
+</message>
+<message>
+    <source>Size (KB)</source>
+    <translation>Taille (KB)</translation>
+</message>
+<message>
+    <source>Size (MB)</source>
+    <translation>Taille (MB)</translation>
+</message>
+<message>
+    <source>Kind</source>
+    <translation>Type</translation>
+</message>
+<message>
+    <source>Modification</source>
+    <translation>Modification</translation>
+</message>
+<message>
+    <source>Match %</source>
+    <translation>Match %</translation>
+</message>
+<message>
+    <source>Words Used</source>
+    <translation>Mots</translation>
+</message>
+<message>
+    <source>Dupe Count</source>
+    <translation># Doublons</translation>
+</message>
+
+<message>
+    <source>Time</source>
+    <translation>Temps</translation>
+</message>
+<message>
+    <source>Bitrate</source>
+    <translation>Bitrate</translation>
+</message>
+<message>
+    <source>Sample Rate</source>
+    <translation>Sample Rate</translation>
+</message>
+<message>
+    <source>Title</source>
+    <translation>Titre</translation>
+</message>
+<message>
+    <source>Artist</source>
+    <translation>Artiste</translation>
+</message>
+<message>
+    <source>Album</source>
+    <translation>Album</translation>
+</message>
+<message>
+    <source>Genre</source>
+    <translation>Genre</translation>
+</message>
+<message>
+    <source>Year</source>
+    <translation>Année</translation>
+</message>
+<message>
+    <source>Track Number</source>
+    <translation>Track</translation>
+</message>
+<message>
+    <source>Comment</source>
+    <translation>Commentaire</translation>
+</message>
+
+<message>
+    <source>Dimensions</source>
+    <translation>Dimensions</translation>
+</message>
 </context>
 
 <!-- ******** Message ******** -->

qt/me/app.py

@@ -17,7 +17,6 @@ class DupeGuru(DupeGuruBase):
     EDITION = 'me'
     LOGO_NAME = 'logo_me'
     NAME = __appname__
-    DELTA_COLUMNS = frozenset([2, 3, 4, 5, 7])
     
     def __init__(self):
         DupeGuruBase.__init__(self, data)

qt/me/preferences_dialog.py

@@ -88,6 +88,8 @@ class PreferencesDialog(PreferencesDialogBase):
         self.widgetsVLayout.addWidget(self.removeEmptyFoldersBox)
         self._setupAddCheckbox('ignoreHardlinkMatches', tr("Ignore duplicates hardlinking to the same file"))
         self.widgetsVLayout.addWidget(self.ignoreHardlinkMatches)
+        self._setupAddCheckbox('debugModeBox', tr(tr("Debug mode (restart required)")))
+        self.widgetsVLayout.addWidget(self.debugModeBox)
         self._setupBottomPart()
     
     def _load(self, prefs, setchecked):

qt/pe/app.py

@@ -59,7 +59,6 @@ class DupeGuru(DupeGuruBase):
     EDITION = 'pe'
     LOGO_NAME = 'logo_pe'
     NAME = __appname__
-    DELTA_COLUMNS = frozenset([2, 5])
     
     def __init__(self):
         DupeGuruBase.__init__(self, data_pe)

qt/pe/preferences_dialog.py

@@ -28,6 +28,8 @@ class PreferencesDialog(PreferencesDialogBase):
         self.widgetsVLayout.addWidget(self.removeEmptyFoldersBox)
         self._setupAddCheckbox('ignoreHardlinkMatches', tr("Ignore duplicates hardlinking to the same file"))
         self.widgetsVLayout.addWidget(self.ignoreHardlinkMatches)
+        self._setupAddCheckbox('debugModeBox', tr(tr("Debug mode (restart required)")))
+        self.widgetsVLayout.addWidget(self.debugModeBox)
         self._setupBottomPart()
     
     def _load(self, prefs, setchecked):

qt/se/app.py

@@ -27,7 +27,6 @@ class DupeGuru(DupeGuruBase):
     EDITION = 'se'
     LOGO_NAME = 'logo_se'
     NAME = __appname__
-    DELTA_COLUMNS = frozenset([2, 4])
     
     def __init__(self):
         DupeGuruBase.__init__(self, data)

qt/se/preferences_dialog.py

@@ -76,6 +76,8 @@ class PreferencesDialog(PreferencesDialogBase):
         self.verticalLayout_4.addLayout(self.horizontalLayout_2)
         self._setupAddCheckbox('ignoreHardlinkMatches', tr("Ignore duplicates hardlinking to the same file"), self.widget)
         self.verticalLayout_4.addWidget(self.ignoreHardlinkMatches)
+        self._setupAddCheckbox('debugModeBox', tr(tr("Debug mode (restart required)")), self.widget)
+        self.verticalLayout_4.addWidget(self.debugModeBox)
         self.widgetsVLayout.addWidget(self.widget)
         self._setupBottomPart()
     
@@ -85,7 +87,9 @@ class PreferencesDialog(PreferencesDialogBase):
         if sys.platform == 'linux2':
             # Under linux, whether it's a Qt layout bug or something else, the size threshold text edit
             # doesn't have enough space, so we make the pref pane higher to compensate.
-            self.resize(self.width(), 480)
+            self.resize(self.width(), 490)
+        elif sys.platform == 'win32':
+            self.resize(self.width(), 420)
     
     def _load(self, prefs, setchecked):
         scan_type_index = SCAN_TYPE_ORDER.index(prefs.scan_type)