cocoa: get rid of edition-specific ResultWindow overrides

cocoa/se/AppDelegate.m

@@ -45,8 +45,41 @@ http://www.gnu.org/licenses/gpl-3.0.html
     return @"http://www.hardcoded.net/dupeguru/";
 }
 
-- (ResultWindowBase *)createResultWindow
+- (void)setScanOptions
 {
-    return [[ResultWindow alloc] initWithParentApp:self];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setScanType:n2i([ud objectForKey:@"scanType"])];
+    [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
+    [model setWordWeighting:n2b([ud objectForKey:@"wordWeighting"])];
+    [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [model setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [model setMatchSimilarWords:n2b([ud objectForKey:@"matchSimilarWords"])];
+    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
+    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
+    [model setSizeThreshold:sizeThreshold];
 }
+
+- (void)initResultColumns:(ResultTable *)aTable
+{
+    HSColumnDef defs[] = {
+        {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
+        {@"name", 195, 16, 0, YES, nil},
+        {@"folder_path", 183, 16, 0, YES, nil},
+        {@"size", 63, 16, 0, YES, nil},
+        {@"extension", 40, 16, 0, YES, nil},
+        {@"mtime", 120, 16, 0, YES, nil},
+        {@"percentage", 60, 16, 0, YES, nil},
+        {@"words", 120, 16, 0, YES, nil},
+        {@"dupe_count", 80, 16, 0, YES, nil},
+        nil
+    };
+    [[aTable columns] initializeColumns:defs];
+    NSTableColumn *c = [[aTable view] tableColumnWithIdentifier:@"marked"];
+    [[c dataCell] setButtonType:NSSwitchButton];
+    [[c dataCell] setControlSize:NSSmallControlSize];
+    c = [[aTable view] tableColumnWithIdentifier:@"size"];
+    [[c dataCell] setAlignment:NSRightTextAlignment];
+    [[aTable columns] restoreColumns];
+}
+
 @end

cocoa/se/ResultWindow.h

@@ -1,13 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "ResultWindowBase.h"
-
-@interface ResultWindow : ResultWindowBase {}
-@end

cocoa/se/ResultWindow.m

@@ -1,52 +0,0 @@
-/* 
-Copyright 2015 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "GPLv3" License as described in the "LICENSE" file, 
-which should be included with this package. The terms are also available at 
-http://www.gnu.org/licenses/gpl-3.0.html
-*/
-
-#import "ResultWindow.h"
-#import "Utils.h"
-#import "Consts.h"
-#import "PyDupeGuru.h"
-
-@implementation ResultWindow
-/* Override */
-- (void)initResultColumns
-{
-    HSColumnDef defs[] = {
-        {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
-        {@"name", 195, 16, 0, YES, nil},
-        {@"folder_path", 183, 16, 0, YES, nil},
-        {@"size", 63, 16, 0, YES, nil},
-        {@"extension", 40, 16, 0, YES, nil},
-        {@"mtime", 120, 16, 0, YES, nil},
-        {@"percentage", 60, 16, 0, YES, nil},
-        {@"words", 120, 16, 0, YES, nil},
-        {@"dupe_count", 80, 16, 0, YES, nil},
-        nil
-    };
-    [[table columns] initializeColumns:defs];
-    NSTableColumn *c = [matches tableColumnWithIdentifier:@"marked"];
-    [[c dataCell] setButtonType:NSSwitchButton];
-    [[c dataCell] setControlSize:NSSmallControlSize];
-    c = [matches tableColumnWithIdentifier:@"size"];
-    [[c dataCell] setAlignment:NSRightTextAlignment];
-    [[table columns] restoreColumns];
-}
-
-- (void)setScanOptions
-{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [model setScanType:n2i([ud objectForKey:@"scanType"])];
-    [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
-    [model setWordWeighting:n2b([ud objectForKey:@"wordWeighting"])];
-    [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
-    [model setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
-    [model setMatchSimilarWords:n2b([ud objectForKey:@"matchSimilarWords"])];
-    int smallFileThreshold = [ud integerForKey:@"smallFileThreshold"]; // In KB
-    int sizeThreshold = [ud boolForKey:@"ignoreSmallFiles"] ? smallFileThreshold * 1024 : 0; // The py side wants bytes
-    [model setSizeThreshold:sizeThreshold];
-}
-@end